Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/worktree-lock' | Junio C Hamano | 2016-07-28 | 1 | -1/+4 |
|\ | |||||
| * | worktree: add "unlock" command | Nguyễn Thái Ngọc Duy | 2016-07-08 | 1 | -1/+1 |
| * | worktree: add "lock" command | Nguyễn Thái Ngọc Duy | 2016-07-08 | 1 | -1/+4 |
* | | Merge branch 'bc/cocci' | Junio C Hamano | 2016-07-19 | 2 | -0/+97 |
|\ \ | |||||
| * | | contrib/coccinelle: add basic Coccinelle transforms | brian m. carlson | 2016-06-28 | 2 | -0/+97 |
* | | | Merge branch 'nd/worktree-cleanup-post-head-protection' | Junio C Hamano | 2016-07-06 | 1 | -0/+23 |
|\ \ \ | | |/ | |/| | |||||
| * | | completion: support git-worktree | Nguyễn Thái Ngọc Duy | 2016-05-24 | 1 | -0/+23 |
* | | | Merge branch 'tb/complete-status' | Junio C Hamano | 2016-06-27 | 1 | -1/+97 |
|\ \ \ | |||||
| * | | | completion: add git statustb/complete-status | Thomas Braun | 2016-06-10 | 1 | -0/+50 |
| * | | | completion: add __git_get_option_value helper | Thomas Braun | 2016-06-10 | 1 | -0/+44 |
| * | | | completion: factor out untracked file modes into a variable | Thomas Braun | 2016-06-10 | 1 | -1/+3 |
* | | | | Merge branch 'nb/gnome-keyring-build' | Junio C Hamano | 2016-06-27 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | gnome-keyring: Don't hard-code pkg-config executablenb/gnome-keyring-build | Heiko Becker | 2016-06-14 | 1 | -2/+3 |
* | | | | | Merge branch 'vs/prompt-avoid-unset-variable' | Junio C Hamano | 2016-06-27 | 1 | -3/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shavs/prompt-avoid-unset-variable | Ville Skyttä | 2016-06-06 | 1 | -3/+3 |
* | | | | | git-multimail: update to release 1.3.1 | Matthieu Moy | 2016-05-13 | 4 | -4/+20 |
* | | | | | Sync with maint | Junio C Hamano | 2016-05-03 | 8 | -143/+476 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | git-multimail: update to release 1.3.0 | Matthieu Moy | 2016-05-03 | 8 | -143/+476 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'mg/complete-cherry-mark-to-log' | Junio C Hamano | 2016-04-13 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | completion: complete --cherry-mark for git logmg/complete-cherry-mark-to-log | Michael J Gruber | 2016-04-05 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'rt/completion-help' | Junio C Hamano | 2016-04-13 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | completion: add 'revisions' and 'everyday' to 'git help'rt/completion-help | Ralf Thielow | 2016-03-24 | 1 | -2/+2 |
| * | | | completion: add option '--guides' to 'git help' | Ralf Thielow | 2016-03-24 | 1 | -1/+1 |
| * | | | Merge branch 'pw/completion-stash' into maint | Junio C Hamano | 2016-02-22 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'tb/complete-word-diff-regex' into maint | Junio C Hamano | 2016-02-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'pw/completion-stash' into maint | Junio C Hamano | 2016-02-05 | 1 | -3/+14 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'pw/completion-show-branch' into maint | Junio C Hamano | 2016-02-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/completion-rebase' into maint | Junio C Hamano | 2016-02-05 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dw/subtree-split-do-not-drop-merge' into maint | Junio C Hamano | 2016-02-05 | 2 | -2/+70 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'pw/completion-stash' | Junio C Hamano | 2016-02-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | completion: fix mis-indentation in _git_stash()pw/completion-stash | SZEDER Gábor | 2016-02-22 | 1 | -2/+2 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cc/untracked' | Junio C Hamano | 2016-02-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config: add core.untrackedCache | Christian Couder | 2016-01-27 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'pw/completion-stash' | Junio C Hamano | 2016-02-03 | 1 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | completion: update completion arguments for stash | Paul Wagland | 2016-01-26 | 1 | -3/+14 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'pw/completion-show-branch' | Junio C Hamano | 2016-02-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | completion: complete show-branch "--date-order"pw/completion-show-branch | Paul Wagland | 2016-01-25 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/completion-rebase' | Junio C Hamano | 2016-02-03 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | completion: add missing git-rebase optionsjk/completion-rebase | John Keeping | 2016-01-25 | 1 | -2/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'dw/subtree-split-do-not-drop-merge' | Junio C Hamano | 2016-02-03 | 2 | -2/+70 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-merge | Dave Ware | 2016-01-20 | 2 | -2/+70 |
* | | | | | | | Merge branch 'tb/complete-word-diff-regex' | Junio C Hamano | 2016-02-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | completion: complete "diff --word-diff-regex="tb/complete-word-diff-regex | Thomas Braun | 2016-01-20 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'dg/subtree-test' | Junio C Hamano | 2016-02-03 | 1 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | contrib/subtree: Make testing easierdg/subtree-test | David A. Greene | 2016-01-19 | 1 | -1/+5 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/pull-rebase-i' | Junio C Hamano | 2016-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: add missing branch.*.rebase valuesjs/pull-rebase-i | Johannes Schindelin | 2016-01-13 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ep/shell-command-substitution-style' | Junio C Hamano | 2016-01-22 | 6 | -16/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for comm... | Elia Pinto | 2015-12-27 | 1 | -2/+2 |
| * | | | | | | contrib/examples/git-revert.sh: use the $( ... ) construct for command substi... | Elia Pinto | 2015-12-27 | 1 | -4/+4 |