![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 May 2009 02:49:42 +0000 (19:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 May 2009 02:49:42 +0000 (19:49 -0700) | ||
| commit | 671d1bc6a098d1015fbdd6e085d6daf12c1dce15 | |
| tree | 20fa2bf3411f0ac3b3185a2f354b03341b92aa14 | tree | snapshot |
| parent | 8a94bc7bdc54db0d77058e63baf173ff932cba7c | commit | diff |
| parent | e4b09dad9f65395fd4bb8ab165012a3a6698a75b | commit | diff |
Merge branch 'maint'
* maint:
test: checkout shouldn't say that HEAD has moved if it didn't
completion: enhance "current branch" display
completion: simplify "current branch" in __git_ps1()
completion: fix PS1 display during a merge on detached HEAD
builtin-checkout: Don't tell user that HEAD has moved before it has
pre-commit.sample: don't print incidental SHA1
tests: Add tests for missing format-patch long options
api-parse-options.txt: use 'func' instead of 'funct'
Turn on USE_ST_TIMESPEC for OpenBSD
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"
* maint:
test: checkout shouldn't say that HEAD has moved if it didn't
completion: enhance "current branch" display
completion: simplify "current branch" in __git_ps1()
completion: fix PS1 display during a merge on detached HEAD
builtin-checkout: Don't tell user that HEAD has moved before it has
pre-commit.sample: don't print incidental SHA1
tests: Add tests for missing format-patch long options
api-parse-options.txt: use 'func' instead of 'funct'
Turn on USE_ST_TIMESPEC for OpenBSD
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"
| contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |