diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-18 05:39:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 05:39:37 (GMT) |
| commit | 9f4c4eb0e16d1e21eaaf5cab5591c3491456cd14 (patch) | |
| tree | 8d5ce2c1b19e1c077e8fee1e93af2f6506a6e491 /git-mergetool.sh | |
| parent | 9716f21b483233536d1eca9498f4ae4433dfd34f (diff) | |
| parent | 9e384b4589cfba8fa057e0e124cdd4f6cc92fc66 (diff) | |
| download | git-9f4c4eb0e16d1e21eaaf5cab5591c3491456cd14.zip git-9f4c4eb0e16d1e21eaaf5cab5591c3491456cd14.tar.gz git-9f4c4eb0e16d1e21eaaf5cab5591c3491456cd14.tar.bz2 | |
Merge branch 'ph/parseopt-sh'
* ph/parseopt-sh:
git-quiltimport.sh fix --patches handling
git-am: -i does not take a string parameter.
sh-setup: don't let eval output to be shell-expanded.
git-sh-setup: fix parseopt `eval` string underquoting
Give git-am back the ability to add Signed-off-by lines.
git-rev-parse --parseopt
scripts: Add placeholders for OPTIONS_SPEC
Migrate git-repack.sh to use git-rev-parse --parseopt
Migrate git-quiltimport.sh to use git-rev-parse --parseopt
Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash
Migrate git-instaweb.sh to use git-rev-parse --parseopt
Migrate git-merge.sh to use git-rev-parse --parseopt
Migrate git-am.sh to use git-rev-parse --parseopt
Migrate git-clone to use git-rev-parse --parseopt
Migrate git-clean.sh to use git-rev-parse --parseopt.
Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt
Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts.
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index a68b403..5587c5e 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -10,6 +10,7 @@ USAGE='[--tool=tool] [file to merge] ...' SUBDIRECTORY_OK=Yes +OPTIONS_SPEC= . git-sh-setup require_work_tree prefix=$(git rev-parse --show-prefix) |