summaryrefslogtreecommitdiffstats
path: root/contrib (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / /
* | | | | Merge branch 'jc/completion-no-chdir'Junio C Hamano2014-10-161-11/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | completion: use "git -C $there" instead of (cd $there && git ...)Junio C Hamano2014-10-101-11/+7
| | |_|/ | |/| |
* | | | completion: add --show-signature for log and showDavid Aguilar2014-10-071-0/+2
* | | | Merge branch 'tb/complete-diff-ignore-blank-lines'Junio C Hamano2014-09-191-2/+2
|\ \ \ \
| * | | | completion: Add --ignore-blank-lines for diffThomas Braun2014-09-031-2/+2
* | | | | Merge branch 'mb/build-contrib-svn-fe'Junio C Hamano2014-09-191-9/+51
|\ \ \ \ \
| * | | | | contrib/svn-fe: fix MakefileMaxim Bublis2014-08-291-9/+51
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/contrib-subtree-make-all'Junio C Hamano2014-09-111-1/+4
|\ \ \ \ \
| * | | | | subtree: make "all" default target of MakefileJeff 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_DIRJeff 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=`John 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-281-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 '...' -" aliasesSteffen Prohaska2014-06-131-0/+10
* | | | | | Merge branch 'jk/complete-merge-pull'Junio C Hamano2014-06-161-1/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | completion: add missing options for git-mergeJohn 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 variablesPat 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-241-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jd/subtree'Junio C Hamano2014-06-062-16/+25
|\ \ \ \ \
| * | | | | contrib/subtree: allow adding an annotated tagJames Denholm2014-05-131-1/+2