![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3746501)
raw | patch | inline | side by side (parent: 3746501)
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 5 Nov 2005 02:17:16 +0000 (18:17 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 5 Nov 2005 02:17:16 +0000 (18:17 -0800) |
Pasky and I did overlapping documentation independently; this is to
pick up better wordings from what he sent me.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
pick up better wordings from what he sent me.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/merge-pull-opts.txt | patch | blob | history | |
| git-pull.sh | patch | blob | history |
index d03fd16178e8b687485afefb2f31617ddb77bd5e..d9164a04a6fceb4c34965f10aa2ae12d2278bce5 100644 (file)
--no-commit::
Perform the merge but pretend the merge failed and do
- not autocommit.
+ not autocommit, to give the user a chance to inspect and
+ further tweak the merge result before committing.
-s <strategy>::
use that merge strategy; can be given more than once to
diff --git a/git-pull.sh b/git-pull.sh
index 96016270b4a1746ac1f075ed9fbcf62e754005e8..e23d4f559790fed079bb5759fd5aa11a8804f191 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
. git-sh-setup || die "Not a git archive"
usage () {
- die "git pull [-n] [-s strategy]... <repo> <head>..."
+ die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
}
strategy_args= no_summary= no_commit=