diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-22 22:40:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-22 22:40:30 -0700 |
| commit | 02a20456d2c5efccbdd0093ad2a16134f160c218 (patch) | |
| tree | 7377c60146663d9a6402d6742be92591eefa07b2 /git-merge.sh | |
| parent | 87b787ac77e0d8f81468dcba2a39c9d0287870c3 (diff) | |
| parent | 0abc0260fa3419de649fcc1444e3d256a17ca6c7 (diff) | |
| download | git-02a20456d2c5efccbdd0093ad2a16134f160c218.tar.gz git-02a20456d2c5efccbdd0093ad2a16134f160c218.tar.xz | |
Merge branch 'maint'
* maint:
pager: default to LESS=FRSX not LESS=FRS
Make prune also run prune-packed
git-vc: better installation instructions
gitweb: Do not esc_html $basedir argument to git_print_tree_entry
gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
Fix usagestring for git-branch
git-merge: show usage if run without arguments
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 49c46d55d..cb094388b 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -93,6 +93,8 @@ finish () { esac } +case "$#" in 0) usage ;; esac + rloga= while case "$#" in 0) break ;; esac do |