summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/complete-diff-ignore-blank-lines'Junio C Hamano2014-09-191-2/+2
|\
| * completion: Add --ignore-blank-lines for difftb/complete-diff-ignore-blank-linesThomas Braun2014-09-031-2/+2
* | Merge branch 'mb/build-contrib-svn-fe'Junio C Hamano2014-09-191-9/+51
|\ \
| * | contrib/svn-fe: fix Makefilemb/build-contrib-svn-feMaxim Bublis2014-08-281-9/+51
* | | Merge branch 'jk/contrib-subtree-make-all'Junio C Hamano2014-09-111-1/+4
|\ \ \
| * | | subtree: make "all" default target of Makefilejk/contrib-subtree-make-allJeff King2014-08-181-1/+4
* | | | Merge branch 'jk/prompt-stash-could-be-packed'Junio C Hamano2014-09-091-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | git-prompt: do not look for refs/stash in $GIT_DIRjk/prompt-stash-could-be-packedJeff King2014-08-251-1/+2
| | |/ | |/|
| * | Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano2014-07-221-1/+2
| |\ \
* | | | various contrib: Fix links in man pagesStefan Beller2014-08-073-3/+3
* | | | Merge branch 'jk/more-push-completion'Junio C Hamano2014-07-301-1/+27
|\ \ \ \
| * | | | completion: complete `git push --force-with-lease=`jk/more-push-completionJohn Keeping2014-07-221-1/+21
| * | | | completion: add some missing options to `git push`John Keeping2014-07-221-0/+1
| * | | | completion: complete "unstuck" `git push --recurse-submodules`John Keeping2014-07-221-0/+5
| |/ / /
* | | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-271-0/+28
|\ \ \ \ | |_|_|/ |/| | |
| * | | contrib: add convert-grafts-to-replace-refs.shChristian Couder2014-07-211-0/+28
* | | | Fix contrib/subtree Makefile to patch #! lineCharles Bailey2014-07-211-1/+7
|/ / /
* | | Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-06-255-8/+8
|\ \ \
| * | | contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
* | | | Merge branch 'sp/complete-ext-alias'Junio C Hamano2014-06-251-0/+10
|\ \ \ \
| * | | | completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliasessp/complete-ext-aliasSteffen Prohaska2014-06-131-0/+10
* | | | | Merge branch 'jk/complete-merge-pull'Junio C Hamano2014-06-161-1/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | completion: add missing options for git-mergejk/complete-merge-pullJohn Keeping2014-05-271-1/+4
| * | | | completion: add a note that merge options are sharedJohn Keeping2014-05-271-0/+1
| |/ / /
* | | | Merge branch 'sk/wincred'Junio C Hamano2014-06-161-4/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | wincred: avoid overwriting configured variablessk/wincredPat Thoyts2014-05-141-4/+4
| * | | wincred: add install targetPat Thoyts2014-05-141-0/+8
| * | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-081-2/+32
| |\ \ \
* | \ \ \ Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-061-1/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-231-1/+2
* | | | | Merge branch 'jd/subtree'Junio C Hamano2014-06-062-16/+25
|\ \ \ \ \
| * | | | | contrib/subtree: allow adding an annotated tagjd/subtreeJames Denholm2014-05-131-1/+2
| * | | | | contrib/subtree/Makefile: clean up rule for "clean"James Denholm2014-05-061-3/+4
| * | | | | contrib/subtree/Makefile: clean up rules to generate documentationJames Denholm2014-05-061-5/+8
| * | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/James Denholm2014-05-061-3/+3
| * | | | | contrib/subtree/Makefile: use GIT-VERSION-FILEJames Denholm2014-05-061-3/+8
| * | | | | contrib/subtree/Makefile: scrap unused $(gitdir)James Denholm2014-05-061-1/+0
* | | | | | Merge branch 'wg/svn-fe-style-fixes'Junio C Hamano2014-06-061-41/+52
|\ \ \ \ \ \
| * | | | | | svn-fe: conform to pep8wg/svn-fe-style-fixesWilliam Giokas2014-05-121-41/+52
| |/ / / / /
* | | | | | Merge branch 'jn/contrib-remove-vim'Junio C Hamano2014-06-061-22/+0
|\ \ \ \ \ \
| * | | | | | contrib: remove vim support instructionsjn/contrib-remove-vimJonathan Nieder2014-05-091-22/+0
| |/ / / / /
* | | | | | Merge branch 'jn/contrib-remove-diffall'Junio C Hamano2014-06-062-288/+0
|\ \ \ \ \ \
| * | | | | | contrib: remove git-diffalljn/contrib-remove-diffallJonathan Nieder2014-05-092-288/+0
| |/ / / / /
* | | | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-06-034-12/+12
|\ \ \ \ \ \
| * | | | | | appp.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-7/+7
| * | | | | | t7900-subtree.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1