Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tb/complete-diff-ignore-blank-lines' | Junio C Hamano | 2014-09-19 | 1 | -2/+2 |
|\ | |||||
| * | completion: Add --ignore-blank-lines for diff | Thomas Braun | 2014-09-03 | 1 | -2/+2 |
* | | Merge branch 'mb/build-contrib-svn-fe' | Junio C Hamano | 2014-09-19 | 1 | -9/+51 |
|\ \ | |||||
| * | | contrib/svn-fe: fix Makefile | Maxim Bublis | 2014-08-29 | 1 | -9/+51 |
* | | | Merge branch 'jk/contrib-subtree-make-all' | Junio C Hamano | 2014-09-11 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | subtree: make "all" default target of Makefile | Jeff King | 2014-08-18 | 1 | -1/+4 |
* | | | | Merge branch 'jk/prompt-stash-could-be-packed' | Junio C Hamano | 2014-09-09 | 1 | -1/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | git-prompt: do not look for refs/stash in $GIT_DIR | Jeff King | 2014-08-25 | 1 | -1/+2 |
| | |/ | |/| | |||||
| * | | Merge branch 'ep/shell-assign-and-export-vars' into maint | Junio C Hamano | 2014-07-22 | 1 | -1/+2 |
| |\ \ | |||||
* | | | | various contrib: Fix links in man pages | Stefan Beller | 2014-08-07 | 3 | -3/+3 |
* | | | | Merge branch 'jk/more-push-completion' | Junio C Hamano | 2014-07-30 | 1 | -1/+27 |
|\ \ \ \ | |||||
| * | | | | completion: complete `git push --force-with-lease=` | John Keeping | 2014-07-22 | 1 | -1/+21 |
| * | | | | completion: add some missing options to `git push` | John Keeping | 2014-07-22 | 1 | -0/+1 |
| * | | | | completion: complete "unstuck" `git push --recurse-submodules` | John Keeping | 2014-07-22 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | Merge branch 'cc/replace-graft' | Junio C Hamano | 2014-07-28 | 1 | -0/+28 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | contrib: add convert-grafts-to-replace-refs.sh | Christian Couder | 2014-07-21 | 1 | -0/+28 |
* | | | | Fix contrib/subtree Makefile to patch #! line | Charles Bailey | 2014-07-21 | 1 | -1/+7 |
|/ / / | |||||
* | | | Merge branch 'ep/avoid-test-a-o' | Junio C Hamano | 2014-06-25 | 5 | -8/+8 |
|\ \ \ | |||||
| * | | | contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
| * | | | contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -2/+2 |
| * | | | contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -2/+2 |
| * | | | contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -2/+2 |
| * | | | contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
* | | | | Merge branch 'sp/complete-ext-alias' | Junio C Hamano | 2014-06-25 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases | Steffen Prohaska | 2014-06-13 | 1 | -0/+10 |
* | | | | | Merge branch 'jk/complete-merge-pull' | Junio C Hamano | 2014-06-16 | 1 | -1/+5 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | completion: add missing options for git-merge | John Keeping | 2014-05-27 | 1 | -1/+4 |
| * | | | | completion: add a note that merge options are shared | John Keeping | 2014-05-27 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge branch 'sk/wincred' | Junio C Hamano | 2014-06-16 | 1 | -4/+12 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | wincred: avoid overwriting configured variables | Pat Thoyts | 2014-05-14 | 1 | -4/+4 |
| * | | | wincred: add install target | Pat Thoyts | 2014-05-14 | 1 | -0/+8 |
| * | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+32 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'ep/shell-assign-and-export-vars' | Junio C Hamano | 2014-06-06 | 1 | -1/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | scripts: "export VAR=VALUE" construct is not portable | Elia Pinto | 2014-05-24 | 1 | -1/+2 |
* | | | | | Merge branch 'jd/subtree' | Junio C Hamano | 2014-06-06 | 2 | -16/+25 |
|\ \ \ \ \ | |||||
| * | | | | | contrib/subtree: allow adding an annotated tag | James Denholm | 2014-05-13 | 1 | -1/+2 |
| * | | | | | contrib/subtree/Makefile: clean up rule for "clean" | James Denholm | 2014-05-07 | 1 | -3/+4 |
| * | | | | | contrib/subtree/Makefile: clean up rules to generate documentation | James Denholm | 2014-05-07 | 1 | -5/+8 |
| * | | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/ | James Denholm | 2014-05-07 | 1 | -3/+3 |
| * | | | | | contrib/subtree/Makefile: use GIT-VERSION-FILE | James Denholm | 2014-05-07 | 1 | -3/+8 |
| * | | | | | contrib/subtree/Makefile: scrap unused $(gitdir) | James Denholm | 2014-05-06 | 1 | -1/+0 |
* | | | | | | Merge branch 'wg/svn-fe-style-fixes' | Junio C Hamano | 2014-06-06 | 1 | -41/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | svn-fe: conform to pep8 | William Giokas | 2014-05-12 | 1 | -41/+52 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jn/contrib-remove-vim' | Junio C Hamano | 2014-06-06 | 1 | -22/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | contrib: remove vim support instructions | Jonathan Nieder | 2014-05-09 | 1 | -22/+0 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jn/contrib-remove-diffall' | Junio C Hamano | 2014-06-06 | 2 | -288/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | contrib: remove git-diffall | Jonathan Nieder | 2014-05-09 | 2 | -288/+0 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ep/shell-command-substitution' | Junio C Hamano | 2014-06-03 | 4 | -12/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | appp.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-24 | 1 | -7/+7 |
| * | | | | | | t7900-subtree.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-24 | 1 | -1/+1 |