summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-271-1/+1
|\
| * completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-xMárcio Almada2015-04-121-1/+1
* | Merge branch 'jk/colors' into maintJunio C Hamano2015-04-211-2/+7
|\ \
| * | diff-highlight: do not split multibyte charactersjk/colorsKyle J. McKay2015-04-041-2/+7
* | | Merge branch 'sg/completion-gitcomp-nl-for-refs' into maintJunio C Hamano2015-03-281-2/+2
|\ \ \
| * | | completion: use __gitcomp_nl() for completing refssg/completion-gitcomp-nl-for-refsSZEDER Gábor2015-03-221-2/+2
* | | | Merge branch 'ct/prompt-untracked-fix' into maintJunio C Hamano2015-03-281-1/+1
|\ \ \ \
| * | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fixCody A Taylor2015-03-151-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'js/completion-ctags-pattern-substitution-fix' into maintJunio C Hamano2015-03-271-1/+1
|\ \ \ \
| * | | | contrib/completion: escape the forward slash in __git_match_ctagjs/completion-ctags-pattern-substitution-fixJohn Szakmeister2015-03-141-1/+1
| |/ / /
* | | | Merge branch 'sg/completion-remote' into maintJunio C Hamano2015-03-231-5/+2
|\ \ \ \
| * | | | completion: simplify __git_remotes()sg/completion-remoteSZEDER Gábor2015-03-061-5/+2
* | | | | Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-231-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | config,completion: add color.status.unmergedmg/doc-status-color-slotMichael J Gruber2015-03-101-0/+1
| |/ / /
* | | | Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano2015-03-051-3/+22
|\ \ \ \ | |/ / / |/| | |
| * | | wincred: fix get credential if username has "@"av/wincred-with-at-in-username-fixAleksey Vasenev2015-01-251-3/+22
* | | | Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano2015-01-141-5/+5
|\ \ \ \
| * | | | git-prompt: preserve value of $? in all casestf/prompt-preserve-exit-statusTony Finch2015-01-141-4/+4
* | | | | Merge branch 'rh/hide-prompt-in-ignored-directory'Junio C Hamano2015-01-141-7/+17
|\ \ \ \ \
| * | | | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directoryJess Austin2015-01-071-0/+13
| * | | | | git-prompt.sh: if pc mode, immediately set PS1 to a plain promptRichard Hansen2015-01-071-7/+4
* | | | | | Merge branch 'mm/complete-rebase-autostash'Junio C Hamano2015-01-141-0/+1
|\ \ \ \ \ \
| * | | | | | git-completion: add --autostash for 'git rebase'mm/complete-rebase-autostashMatthieu Moy2015-01-071-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sp/subtree-doc'Junio C Hamano2015-01-141-105/+89
|\ \ \ \ \ \
| * | | | | | subtree: fix AsciiDoc list item continuationsp/subtree-docSteffen Prohaska2015-01-061-105/+89
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano2015-01-071-0/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | git-prompt: preserve value of $? inside shell promptTony Finch2014-12-221-0/+4
| |/ / / /
* | | | | Merge branch 'pd/completion-filenames-fix'Junio C Hamano2015-01-072-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update documentation occurrences of filename .shpd/completion-filenames-fixPeter van der Does2014-12-152-3/+3
* | | | | Merge branch 'jg/prompt-localize-temporary'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \
| * | | | | git-prompt.sh: make $f local to __git_eread()jg/prompt-localize-temporaryJustin Guenther2014-12-121-1/+1
* | | | | | Merge branch 'jk/colors'Junio C Hamano2014-12-222-13/+90
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | diff-highlight: allow configurable colorsJeff King2014-11-202-13/+90
* | | | | | Merge branch 'rt/completion-tag'Junio C Hamano2014-12-221-0/+10
|\ \ \ \ \ \
| * | | | | | completion: add git-tag optionsrt/completion-tagRalf Thielow2014-12-041-0/+10
| |/ / / / /
* | | | | | Merge branch 'ps/new-workdir-into-empty-directory'Junio C Hamano2014-12-221-15/+38
|\ \ \ \ \ \
| * | | | | | git-new-workdir: don't fail if the target directory is emptyps/new-workdir-into-empty-directoryPaul Smith2014-12-031-15/+38
| | |_|_|/ / | |/| | | |
* | | | | | git-send-email: add --transfer-encoding optionpb/send-email-tePaolo Bonzini2014-11-251-0/+4
|/ / / / /
* | | | | Merge branch 'js/diff-highlight-avoid-sigpipe'Junio C Hamano2014-11-101-0/+4
|\ \ \ \ \
| * | | | | diff-highlight: exit when a pipe is brokenjs/diff-highlight-avoid-sigpipeJohn Szakmeister2014-11-041-0/+4
* | | | | | Documentation: typofixesThomas Ackermann2014-11-041-1/+1
* | | | | | Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano2014-10-291-1/+1
|\ \ \ \ \ \
| * | | | | | mergetool: rename bc3 to bcoc/mergetools-beyondcompareJunio C Hamano2014-10-211-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'jk/prompt-stash-could-be-packed' into maintJunio C Hamano2014-09-191-1/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'js/completion-hide-not-a-repo'Junio C Hamano2014-10-211-1/+2
|\ \ \ \ \ \ \
| * | | | | | | completion: silence "fatal: Not a git repository" errorjs/completion-hide-not-a-repoJohn Szakmeister2014-10-141-1/+2
* | | | | | | | Merge branch 'ss/contrib-subtree-contacts'Junio C Hamano2014-10-204-3/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | contacts: add a Makefile to generate docs and installss/contrib-subtree-contactsSebastian Schuberth2014-10-152-0/+74
| * | | | | | | | subtree: add an install-html targetSebastian Schuberth2014-10-152-3/+9
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/completion-no-chdir'Junio C Hamano2014-10-161-11/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
View Lorry Controller Status