x/git-upstream
Code Issues Proposed changes

Update the read-tree command in USAGE.md

Browse Source 
After fixing conflicts, the docs instruct you to finish the merge
manually. The command as is does not update the state of the tree and
leaves nothing to commit for the final step.

Looking at the code it should be
'git read-tree -u --reset <import-xxxx>'
(https://github.com/stackforge/git-upstream/blob/master/git_upstream/commands/import.py#L390)

Change-Id: I58a8629735bfdfb34ebc46d3b1f43d3bb8d4c96b
Closes-Bug: #1484574
This commit is contained in:
Paul Bourke
2015-08-13 15:46:07 +01:00
parent a64416eb1d
commit dc9567b919
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
USAGE.md
View File

@@ -399,7 +399,7 @@ git merge -s ours --no-commit <import-xxxx>
Replacing tree contents with those from the import branch Replacing tree contents with those from the import branch
```bash ```bash
git read-tree <import-xxxx> git read-tree -u --reset <import-xxxx>
``` ```
Committing merge commit Committing merge commit