Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | contrib/subtree: small tidy-up to testcb/subtree-tests-update | Charles Bailey | 2015-06-22 | 1 | -3/+1 |
* | contrib/subtree: fix broken &&-chains and revealed test error | Charles Bailey | 2015-06-22 | 1 | -4/+4 |
* | contrib/subtree: use tabs consitently for indentation in tests | Charles Bailey | 2015-06-22 | 1 | -147/+147 |
* | Merge branch 'mh/multimail-renewal' | Junio C Hamano | 2015-04-28 | 2 | -24/+25 |
|\ | |||||
| * | Update git-multimail to version 1.0.2mh/multimail-renewal | Michael Haggerty | 2015-04-28 | 2 | -24/+25 |
| * | Merge branch 'ma/bash-completion-leaking-x' into maint | Junio C Hamano | 2015-04-27 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'jk/colors' into maint | Junio C Hamano | 2015-04-21 | 1 | -2/+7 |
| |\ \ | |||||
| * \ \ | Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint | Junio C Hamano | 2015-03-28 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ct/prompt-untracked-fix' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint | Junio C Hamano | 2015-03-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sg/completion-remote' into maint | Junio C Hamano | 2015-03-23 | 1 | -5/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mg/doc-status-color-slot' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'ma/bash-completion-leaking-x' | Junio C Hamano | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-x | Márcio Almada | 2015-04-12 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2015-04-14 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | diff-highlight: do not split multibyte charactersjk/colors | Kyle J. McKay | 2015-04-04 | 1 | -2/+7 |
* | | | | | | | | | Merge branch 'sg/completion-gitcomp-nl-for-refs' | Junio C Hamano | 2015-03-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | completion: use __gitcomp_nl() for completing refssg/completion-gitcomp-nl-for-refs | SZEDER Gábor | 2015-03-22 | 1 | -2/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'av/wincred-with-at-in-username-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+22 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'ct/prompt-untracked-fix' | Junio C Hamano | 2015-03-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fix | Cody A Taylor | 2015-03-15 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix' | Junio C Hamano | 2015-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | contrib/completion: escape the forward slash in __git_match_ctagjs/completion-ctags-pattern-substitution-fix | John Szakmeister | 2015-03-14 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/push-config' | Junio C Hamano | 2015-03-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-config | Dave Olszewski | 2015-03-14 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'mg/doc-status-color-slot' | Junio C Hamano | 2015-03-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | config,completion: add color.status.unmergedmg/doc-status-color-slot | Michael J Gruber | 2015-03-10 | 1 | -0/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sg/completion-remote' | Junio C Hamano | 2015-03-17 | 1 | -5/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | completion: simplify __git_remotes()sg/completion-remote | SZEDER Gábor | 2015-03-06 | 1 | -5/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'av/wincred-with-at-in-username-fix' | Junio C Hamano | 2015-02-18 | 1 | -3/+22 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | wincred: fix get credential if username has "@"av/wincred-with-at-in-username-fix | Aleksey Vasenev | 2015-01-25 | 1 | -3/+22 |
* | | | | | Merge branch 'cj/log-invert-grep' | Junio C Hamano | 2015-02-11 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | log: teach --invert-grep optioncj/log-invert-grep | Christoph Junghans | 2015-01-13 | 1 | -1/+1 |
* | | | | | Merge branch 'tf/prompt-preserve-exit-status' | Junio C Hamano | 2015-01-14 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | git-prompt: preserve value of $? in all casestf/prompt-preserve-exit-status | Tony Finch | 2015-01-14 | 1 | -4/+4 |
* | | | | | | Merge branch 'rh/hide-prompt-in-ignored-directory' | Junio C Hamano | 2015-01-14 | 1 | -7/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directory | Jess Austin | 2015-01-07 | 1 | -0/+13 |
| * | | | | | | git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt | Richard Hansen | 2015-01-07 | 1 | -7/+4 |
* | | | | | | | Merge branch 'mm/complete-rebase-autostash' | Junio C Hamano | 2015-01-14 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-completion: add --autostash for 'git rebase'mm/complete-rebase-autostash | Matthieu Moy | 2015-01-07 | 1 | -0/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sp/subtree-doc' | Junio C Hamano | 2015-01-14 | 1 | -105/+89 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | subtree: fix AsciiDoc list item continuationsp/subtree-doc | Steffen Prohaska | 2015-01-06 | 1 | -105/+89 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'tf/prompt-preserve-exit-status' | Junio C Hamano | 2015-01-07 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | git-prompt: preserve value of $? inside shell prompt | Tony Finch | 2014-12-22 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'pd/completion-filenames-fix' | Junio C Hamano | 2015-01-07 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Update documentation occurrences of filename .shpd/completion-filenames-fix | Peter van der Does | 2014-12-15 | 2 | -3/+3 |
* | | | | | | Merge branch 'jg/prompt-localize-temporary' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-prompt.sh: make $f local to __git_eread()jg/prompt-localize-temporary | Justin Guenther | 2014-12-12 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2014-12-22 | 2 | -13/+90 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | diff-highlight: allow configurable colors | Jeff King | 2014-11-20 | 2 | -13/+90 |
| | |_|_|_|/ | |/| | | | |