diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-28 16:59:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-28 16:59:42 -0700 |
| commit | 81fa024cd8e336ba257f13fe7724b95baacfa3ad (patch) | |
| tree | 69029df797195eb186535d82bbaadb8e7ed03712 /contrib | |
| parent | d0b16c8f878bef5c1268e033a3d1f427498c7008 (diff) | |
| parent | 371276bf29314af04b804cfd877abcac62674a58 (diff) | |
| download | git-81fa024cd8e336ba257f13fe7724b95baacfa3ad.tar.gz | |
Merge branch 'maint'
* maint:
Makefile: reenable install with NO_CURL
completion: --set-upstream option for git-branch
get_cwd_relative(): do not misinterpret suffix as subdirectory
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 545bd4b383..57245a8c01 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -797,6 +797,7 @@ _git_branch () __gitcomp " --color --no-color --verbose --abbrev= --no-abbrev --track --no-track --contains --merged --no-merged + --set-upstream " ;; *) |