diff options
Diffstat (limited to 'dgit.1')
| -rw-r--r-- | dgit.1 | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -610,7 +610,7 @@ tracking branch. Then somehow, using your other git history plus appropriate diffs and cherry picks from the dgit remote tracking branch, construct a git commit whose tree corresponds to the tree to use for the next upload. If that commit-to-be-uploaded is not a descendant of the -dig remote tracking branch, check it out and say +dgit remote tracking branch, check it out and say .BR "git merge -s ours remotes/dgit/dgit/" \fIsuite\fR; that tells git that we are deliberately throwing away any differences between what's in the archive and what you intend to upload. |