summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'mm/complete-rebase-autostash'Junio C Hamano2015-01-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git-completion: add --autostash for 'git rebase'mm/complete-rebase-autostashMatthieu Moy2015-01-071-0/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sp/subtree-doc'Junio C Hamano2015-01-141-105/+89
|\ \ \ \ \ \ \ \
| * | | | | | | | subtree: fix AsciiDoc list item continuationsp/subtree-docSteffen Prohaska2015-01-061-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 .shpd/completion-filenames-fixPeter 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()jg/prompt-localize-temporaryJustin Guenther2014-12-121-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 optionsrt/completion-tagRalf 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 emptyps/new-workdir-into-empty-directoryPaul Smith2014-12-031-15/+38
| | |_|_|/ / / | |/| | | | |
* | | | | | | git-send-email: add --transfer-encoding optionpb/send-email-tePaolo 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 brokenjs/diff-highlight-avoid-sigpipeJohn 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 bcoc/mergetools-beyondcompareJunio 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" errorjs/completion-hide-not-a-repoJohn 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 installss/contrib-subtree-contactsSebastian Schuberth2014-10-152-0/+74
| * | | | | | | | | subtree: add an install-html targetSebastian Schuberth2014-10-152-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 ...)jc/completion-no-chdirJunio C Hamano2014-10-091-11/+7
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | completion: add --show-signature for log and showda/completion-show-signatureDavid 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 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
View Lorry Controller Status