chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: finalise 9.7
[dgit.git]
/
dgit-maint-native.7.pod
diff --git
a/dgit-maint-native.7.pod
b/dgit-maint-native.7.pod
index ac57728cea1d8f573cdeafbcc9bb70aa6d2fd052..792be1053df9a863685c8eeb93a4b0911977310d 100644
(file)
--- a/
dgit-maint-native.7.pod
+++ b/
dgit-maint-native.7.pod
@@
-85,7
+85,7
@@
is fast forward from the dgit archive view.
Alternatively,
if this was the first ever dgit push of the package,
you can avoid this merge commit by
Alternatively,
if this was the first ever dgit push of the package,
you can avoid this merge commit by
-passing C<--deliberately-not-fast-forward>
.
+passing C<--deliberately-not-fast-forward>
instead of C<--overwrite>.
This avoids introducing a new origin commit into
your git history.
instead of C<--overwrite>.
This avoids introducing a new origin commit into
your git history.