Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pw/completion-stash' | Junio C Hamano | 2016-02-22 | 1 | -2/+2 |
|\ | |||||
| * | completion: fix mis-indentation in _git_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" | Paul Wagland | 2016-01-26 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jk/completion-rebase' | Junio C Hamano | 2016-02-03 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | completion: add missing git-rebase options | John Keeping | 2016-01-26 | 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 bug | 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=" | Thomas Braun | 2016-01-21 | 1 | -1/+1 |
* | | | | | Merge branch 'dg/subtree-test' | Junio C Hamano | 2016-02-03 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | contrib/subtree: Make testing easier | David A. Greene | 2016-01-19 | 1 | -1/+5 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'js/pull-rebase-i' | Junio C Hamano | 2016-01-27 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | completion: add missing branch.*.rebase values | 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-28 | 1 | -2/+2 |
| * | | | | | contrib/examples/git-revert.sh: use the $( ... ) construct for command substi... | Elia Pinto | 2015-12-28 | 1 | -4/+4 |
| * | | | | | contrib/examples/git-repack.sh: use the $( ... ) construct for command substi... | Elia Pinto | 2015-12-28 | 1 | -2/+2 |
| * | | | | | contrib/examples/git-merge.sh: use the $( ... ) construct for command substit... | Elia Pinto | 2015-12-28 | 1 | -2/+2 |
| * | | | | | contrib/examples/git-fetch.sh: use the $( ... ) construct for command substit... | Elia Pinto | 2015-12-28 | 1 | -2/+2 |
| * | | | | | contrib/examples/git-commit.sh: use the $( ... ) construct for command substi... | Elia Pinto | 2015-12-28 | 1 | -4/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'rm/subtree-unwrap-tags' | Junio C Hamano | 2016-01-22 | 1 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | contrib/subtree: unwrap tag refs | Rob Mayoff | 2015-11-24 | 1 | -2/+8 |
* | | | | | | Merge branch 'vl/grep-configurable-threads' | Junio C Hamano | 2016-01-13 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | grep: add --threads=<num> option and grep.threads configuration | Victor Leschuk | 2015-12-16 | 1 | -0/+1 |
* | | | | | | Merge branch 'sg/completion-no-column' | Junio C Hamano | 2015-12-21 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | completion: remove 'git column' from porcelain commands | SZEDER Gábor | 2015-12-11 | 1 | -0/+1 |
* | | | | | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: fix completing unstuck email alias arguments | SZEDER Gábor | 2015-12-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan' | Junio C Hamano | 2015-12-04 | 1 | -4/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bash prompt: indicate dirty index even on orphan branches | SZEDER Gábor | 2015-11-24 | 1 | -3/+2 |
| * | | | | | | | bash prompt: remove a redundant 'git diff' option | SZEDER Gábor | 2015-11-24 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-04 | 1 | -0/+16 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | completion: add support for completing email aliases | Jacob Keller | 2015-11-20 | 1 | -0/+16 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dg/subtree-test-cleanup' | Jeff King | 2015-12-02 | 3 | -443/+956 |
|\ \ \ \ \ | |||||
| * | | | | | contrib/subtree: Handle '--prefix' argument with a slash appended | Techlive Zheng | 2015-11-13 | 2 | -1/+21 |
| * | | | | | contrib/subtree: Make each test self-contained | Techlive Zheng | 2015-11-13 | 1 | -418/+840 |
| * | | | | | contrib/subtree: Add split tests | Techlive Zheng | 2015-11-13 | 1 | -2/+15 |
| * | | | | | contrib/subtree: Add merge tests | Techlive Zheng | 2015-11-13 | 1 | -1/+12 |
| * | | | | | contrib/subtree: Add tests for subtree add | Techlive Zheng | 2015-11-13 | 1 | -0/+19 |
| * | | | | | contrib/subtree: Add test for missing subtree | Techlive Zheng | 2015-11-13 | 1 | -0/+4 |
| * | | | | | contrib/subtree: Clean and refactor test code | Techlive Zheng | 2015-11-13 | 2 | -55/+79 |
| |/ / / / | |||||
* | | | | | Merge branch 'maint' | Jeff King | 2015-12-01 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Escape Git's exec path in contrib/rerere-train.sh script | Daniel Knittl-Frank | 2015-11-20 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'fp/subtree-todo-update' | Jeff King | 2015-11-25 | 1 | -2/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | |