aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAge
* Merge branch 'js/import-tars-hardlinks' into maintJunio C Hamano2016-09-08
|\
| * import-tars: support hard linksJohannes Schindelin2016-08-03
* | Merge branch 'cp/completion-clone-recurse-submodules' into maintJunio C Hamano2016-08-10
|\ \
| * | completion: add option '--recurse-submodules' to 'git clone'Chris Packham2016-07-27
| |/
* | Merge branch 'pm/build-persistent-https-with-recent-go' into maintJunio C Hamano2016-08-10
|\ \
| * | contrib/persistent-https: use Git version for build labelParker Moore2016-07-22
| * | contrib/persistent-https: update ldflags syntax for Go 1.7+Parker Moore2016-07-22
| |/
| * Merge branch 'sg/completion-no-column' into maintJunio C Hamano2016-01-04
| |\
| * \ Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-11
| |\ \
| * \ \ Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-08
| |\ \ \
* | \ \ \ Merge branch 'da/subtree-2.9-regression' into maintJunio C Hamano2016-08-10
|\ \ \ \ \
| * | | | | subtree: fix "git subtree split --rejoin"David Aguilar2016-07-26
| * | | | | t7900-subtree.sh: fix quoting and broken && chainsDavid Aguilar2016-07-26
* | | | | | Merge branch 'nb/gnome-keyring-build' into maintJunio C Hamano2016-07-06
|\ \ \ \ \ \
| * | | | | | gnome-keyring: Don't hard-code pkg-config executableHeiko Becker2016-06-14
* | | | | | | Merge branch 'vs/prompt-avoid-unset-variable' into maintJunio C Hamano2016-07-06
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shaVille Skyttä2016-06-06
* | | | | | | git-multimail: update to release 1.3.1Matthieu Moy2016-05-13
* | | | | | | Sync with maintJunio C Hamano2016-05-03
|\ \ \ \ \ \ \
| * | | | | | | git-multimail: update to release 1.3.0Matthieu Moy2016-05-03
* | | | | | | | Merge branch 'mg/complete-cherry-mark-to-log'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: complete --cherry-mark for git logMichael J Gruber2016-04-05
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rt/completion-help'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | completion: add 'revisions' and 'everyday' to 'git help'Ralf Thielow2016-03-24
| * | | | | | | completion: add option '--guides' to 'git help'Ralf Thielow2016-03-24
| * | | | | | | Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'pw/completion-show-branch' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/completion-rebase' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dw/subtree-split-do-not-drop-merge' into maintJunio C Hamano2016-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/completion-stash'Junio C Hamano2016-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | completion: fix mis-indentation in _git_stash()SZEDER Gábor2016-02-22
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'cc/untracked'Junio C Hamano2016-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: add core.untrackedCacheChristian Couder2016-01-27
* | | | | | | | | | | | | | Merge branch 'pw/completion-stash'Junio C Hamano2016-02-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | completion: update completion arguments for stashPaul Wagland2016-01-26
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pw/completion-show-branch'Junio C Hamano2016-02-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | completion: complete show-branch "--date-order"Paul Wagland2016-01-25
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/completion-rebase'Junio C Hamano2016-02-03
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | completion: add missing git-rebase optionsJohn Keeping2016-01-25
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'dw/subtree-split-do-not-drop-merge'Junio C Hamano2016-02-03
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | contrib/subtree: fix "subtree split" skipped-merge bugDave Ware2016-01-20
* | | | | | | | | | | Merge branch 'tb/complete-word-diff-regex'Junio C Hamano2016-02-03
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | completion: complete "diff --word-diff-regex="Thomas Braun2016-01-20
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dg/subtree-test'Junio C Hamano2016-02-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | contrib/subtree: Make testing easierDavid A. Greene2016-01-19
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: add missing branch.*.rebase valuesJohannes Schindelin2016-01-13
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ep/shell-command-substitution-style'Junio C Hamano2016-01-22
|\ \ \ \ \ \ \ \ \ \