summaryrefslogtreecommitdiffstats
path: root/contrib (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/completion-gitcomp-nl-for-refs'Junio C Hamano2015-03-261-2/+2
|\
| * completion: use __gitcomp_nl() for completing refsSZEDER Gábor2015-03-231-2/+2
| * Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano2015-03-051-3/+22
| |\
* | \ Merge branch 'ct/prompt-untracked-fix'Junio C Hamano2015-03-251-1/+1
|\ \ \
| * | | git prompt: use toplevel to find untracked filesCody A Taylor2015-03-151-1/+1
* | | | Merge branch 'js/completion-ctags-pattern-substitution-fix'Junio C Hamano2015-03-231-1/+1
|\ \ \ \
| * | | | contrib/completion: escape the forward slash in __git_match_ctagJohn Szakmeister2015-03-151-1/+1
| |/ / /
* | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-231-0/+1
|\ \ \ \
| * | | | push: allow --follow-tags to be set by config push.followTagsDave Olszewski2015-03-141-0/+1
* | | | | Merge branch 'mg/doc-status-color-slot'Junio C Hamano2015-03-181-0/+1
|\ \ \ \ \
| * | | | | config,completion: add color.status.unmergedMichael J Gruber2015-03-101-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'sg/completion-remote'Junio C Hamano2015-03-181-5/+2
|\ \ \ \ \
| * | | | | completion: simplify __git_remotes()SZEDER Gábor2015-03-061-5/+2
| |/ / / /
* | | | | Merge branch 'av/wincred-with-at-in-username-fix'Junio C Hamano2015-02-181-3/+22
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | wincred: fix get credential if username has "@"Aleksey Vasenev2015-01-261-3/+22
* | | | Merge branch 'cj/log-invert-grep'Junio C Hamano2015-02-111-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | log: teach --invert-grep optionChristoph Junghans2015-01-131-1/+1
* | | | Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano2015-01-141-5/+5
|\ \ \ \
| * | | | git-prompt: preserve value of $? in all casesTony 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 pwdJess 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'Matthieu Moy2015-01-071-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sp/subtree-doc'Junio C Hamano2015-01-141-105/+89
|\ \ \ \ \ \
| * | | | | | subtree: fix AsciiDoc list item continuationSteffen Prohaska2015-01-071-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 .shPeter 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()Justin Guenther2014-12-131-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 optionsRalf 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 emptyPaul Smith2014-12-031-15/+38
| | |_|_|/ / | |/| | | |
* / | | | | git-send-email: add --transfer-encoding optionPaolo 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 brokenJohn 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 bcJunio 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" errorJohn 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 installSebastian Schuberth2014-10-162-0/+74
| * | | | | | | | subtree: add an install-html targetSebastian Schuberth2014-10-162-3/+9
| |/ / / / / / /