diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-25 21:21:59 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:36:29 +0100 |
commit | 16dd3ffe595a585adc0fffb7f4ab97b29807911b (patch) | |
tree | 2ab82c43f1ec78f1db0c4b80ef51a0caa68af682 /dgit.1 | |
parent | 6a009a8fe0fa46c0d92d51300566c7afcf21ed2e (diff) |
Overwrite: Document --overwrite=VERSION
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit.1')
-rw-r--r-- | dgit.1 | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -641,14 +641,17 @@ archive and record it in the 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 -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 +next upload. + between what's in the archive and what you intend to upload. Then run .BR "dgit push" to actually upload the result. + +If the commit-to-be-uploaded is not a descendant of the +dgit remote tracking branch, you will need to pass +.B --overwrite +to dgit. .SH CONFIGURATION dgit can be configured via the git config system. You may set keys with git-config (either in system-global or per-tree |