aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAge
* Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-06-25
|\
| * contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
| * contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
| * contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
| * contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
| * contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
* | Merge branch 'sp/complete-ext-alias'Junio C Hamano2014-06-25
|\ \
| * | completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliasesSteffen Prohaska2014-06-13
* | | Merge branch 'jk/complete-merge-pull'Junio C Hamano2014-06-16
|\ \ \
| * | | completion: add missing options for git-mergeJohn Keeping2014-05-27
| * | | completion: add a note that merge options are sharedJohn Keeping2014-05-27
| |/ /
* | | Merge branch 'sk/wincred'Junio C Hamano2014-06-16
|\ \ \ | |_|/ |/| |
| * | wincred: avoid overwriting configured variablesPat Thoyts2014-05-14
| * | wincred: add install targetPat Thoyts2014-05-14
| * | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-08
| |\ \
* | \ \ Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-06
|\ \ \ \
| * | | | scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-23
* | | | | Merge branch 'jd/subtree'Junio C Hamano2014-06-06
|\ \ \ \ \
| * | | | | contrib/subtree: allow adding an annotated tagJames Denholm2014-05-13
| * | | | | contrib/subtree/Makefile: clean up rule for "clean"James Denholm2014-05-06
| * | | | | contrib/subtree/Makefile: clean up rules to generate documentationJames Denholm2014-05-06
| * | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/James Denholm2014-05-06
| * | | | | contrib/subtree/Makefile: use GIT-VERSION-FILEJames Denholm2014-05-06
| * | | | | contrib/subtree/Makefile: scrap unused $(gitdir)James Denholm2014-05-06
* | | | | | Merge branch 'wg/svn-fe-style-fixes'Junio C Hamano2014-06-06
|\ \ \ \ \ \
| * | | | | | svn-fe: conform to pep8William Giokas2014-05-12
| |/ / / / /
* | | | | | Merge branch 'jn/contrib-remove-vim'Junio C Hamano2014-06-06
|\ \ \ \ \ \
| * | | | | | contrib: remove vim support instructionsJonathan Nieder2014-05-09
| |/ / / / /
* | | | | | Merge branch 'jn/contrib-remove-diffall'Junio C Hamano2014-06-06
|\ \ \ \ \ \
| * | | | | | contrib: remove git-diffallJonathan Nieder2014-05-09
| |/ / / / /
* | | | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-06-03
|\ \ \ \ \ \
| * | | | | | appp.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-23
| * | | | | | t7900-subtree.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-23
| * | | | | | test-gitmw-lib.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-23
| * | | | | | t9365-continuing-queries.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-23
* | | | | | | Merge branch 'mm/mediawiki-encoding-fix'Junio C Hamano2014-06-03
|\ \ \ \ \ \ \
| * | | | | | | git-remote-mediawiki: fix encoding issue for UTF-8 media filesMatthieu Moy2014-04-23
| * | | | | | | git-remote-mediawiki: allow stop/start-ing the test serverMatthieu Moy2014-04-23
* | | | | | | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-03
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-07
* | | | | | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-20
* | | | | | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-19
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-helpers: point at their upstream repositoriesJunio C Hamano2014-05-19
| * | | | | | | | contrib: remote-helpers: add move warnings (v2.0)Felipe Contreras2014-05-19
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-19
|\ \ \ \ \ \ \ \
| * | | | | | | | git-prompt.sh: don't assume the shell expands the value of PS1Richard Hansen2014-05-19
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-05-13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | contrib: completion: fix 'eread()' namespaceFelipe Contreras2014-05-13
* | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-02
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-22
| | |_|_|/ / | |/| | | |