summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* contrib: add convert-grafts-to-replace-refs.shChristian Couder2014-07-211-0/+28
* 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
| * | | | | | test-gitmw-lib.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-3/+3
| * | | | | | t9365-continuing-queries.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1
* | | | | | | Merge branch 'mm/mediawiki-encoding-fix'Junio C Hamano2014-06-034-2/+36
|\ \ \ \ \ \ \
| * | | | | | | git-remote-mediawiki: fix encoding issue for UTF-8 media filesmm/mediawiki-encoding-fixMatthieu Moy2014-04-232-1/+25
| * | | | | | | git-remote-mediawiki: allow stop/start-ing the test serverMatthieu Moy2014-04-232-1/+11
* | | | | | | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-031-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-1/+2
* | | | | | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-208-4323/+13
* | | | | | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-193-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-helpers: point at their upstream repositoriesJunio C Hamano2014-05-191-0/+19
| * | | | | | | | contrib: remote-helpers: add move warnings (v2.0)Felipe Contreras2014-05-192-0/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-191-17/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-191-17/+39
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-05-131-8/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | contrib: completion: fix 'eread()' namespacefc/prompt-zsh-read-from-fileFelipe Contreras2014-05-131-8/+8
* | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-021-2/+32
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | |
View Lorry Controller Status