Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'av/wincred-with-at-in-username-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+22 |
|\ | |||||
| * | wincred: fix get credential if username has "@"av/wincred-with-at-in-username-fix | Aleksey Vasenev | 2015-01-25 | 1 | -3/+22 |
* | | Merge branch 'tf/prompt-preserve-exit-status' | Junio C Hamano | 2015-01-14 | 1 | -5/+5 |
|\ \ | |||||
| * | | git-prompt: preserve value of $? in all casestf/prompt-preserve-exit-status | Tony Finch | 2015-01-14 | 1 | -4/+4 |
* | | | Merge branch 'rh/hide-prompt-in-ignored-directory' | Junio C Hamano | 2015-01-14 | 1 | -7/+17 |
|\ \ \ | |||||
| * | | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directory | Jess Austin | 2015-01-07 | 1 | -0/+13 |
| * | | | git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt | Richard Hansen | 2015-01-07 | 1 | -7/+4 |
* | | | | Merge branch 'mm/complete-rebase-autostash' | Junio C Hamano | 2015-01-14 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | git-completion: add --autostash for 'git rebase'mm/complete-rebase-autostash | Matthieu Moy | 2015-01-07 | 1 | -0/+1 |
* | | | | | Merge branch 'sp/subtree-doc' | Junio C Hamano | 2015-01-14 | 1 | -105/+89 |
|\ \ \ \ \ | |||||
| * | | | | | subtree: fix AsciiDoc list item continuationsp/subtree-doc | Steffen Prohaska | 2015-01-06 | 1 | -105/+89 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'tf/prompt-preserve-exit-status' | Junio C Hamano | 2015-01-07 | 1 | -0/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | git-prompt: preserve value of $? inside shell prompt | Tony Finch | 2014-12-22 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'pd/completion-filenames-fix' | Junio C Hamano | 2015-01-07 | 2 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Update documentation occurrences of filename .shpd/completion-filenames-fix | Peter van der Does | 2014-12-15 | 2 | -3/+3 |
* | | | | Merge branch 'jg/prompt-localize-temporary' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | git-prompt.sh: make $f local to __git_eread()jg/prompt-localize-temporary | Justin Guenther | 2014-12-12 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2014-12-22 | 2 | -13/+90 |
|\ \ \ \ \ | |||||
| * | | | | | diff-highlight: allow configurable colors | Jeff King | 2014-11-20 | 2 | -13/+90 |
* | | | | | | Merge branch 'rt/completion-tag' | Junio C Hamano | 2014-12-22 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: add git-tag optionsrt/completion-tag | Ralf Thielow | 2014-12-04 | 1 | -0/+10 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ps/new-workdir-into-empty-directory' | Junio C Hamano | 2014-12-22 | 1 | -15/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-new-workdir: don't fail if the target directory is emptyps/new-workdir-into-empty-directory | Paul Smith | 2014-12-03 | 1 | -15/+38 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | git-send-email: add --transfer-encoding optionpb/send-email-te | Paolo Bonzini | 2014-11-25 | 1 | -0/+4 |
|/ / / / / | |||||
* | | | | | Merge branch 'js/diff-highlight-avoid-sigpipe' | Junio C Hamano | 2014-11-10 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | diff-highlight: exit when a pipe is brokenjs/diff-highlight-avoid-sigpipe | John Szakmeister | 2014-11-04 | 1 | -0/+4 |
* | | | | | | Documentation: typofixes | Thomas Ackermann | 2014-11-04 | 1 | -1/+1 |
* | | | | | | Merge branch 'oc/mergetools-beyondcompare' | Junio C Hamano | 2014-10-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mergetool: rename bc3 to bcoc/mergetools-beyondcompare | Junio C Hamano | 2014-10-21 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'jk/prompt-stash-could-be-packed' into maint | Junio C Hamano | 2014-09-19 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'js/completion-hide-not-a-repo' | Junio C Hamano | 2014-10-21 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: silence "fatal: Not a git repository" errorjs/completion-hide-not-a-repo | John Szakmeister | 2014-10-14 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'ss/contrib-subtree-contacts' | Junio C Hamano | 2014-10-20 | 4 | -3/+83 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | contacts: add a Makefile to generate docs and installss/contrib-subtree-contacts | Sebastian Schuberth | 2014-10-15 | 2 | -0/+74 |
| * | | | | | | | | subtree: add an install-html target | Sebastian Schuberth | 2014-10-15 | 2 | -3/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/completion-no-chdir' | Junio C Hamano | 2014-10-16 | 1 | -11/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | completion: use "git -C $there" instead of (cd $there && git ...)jc/completion-no-chdir | Junio C Hamano | 2014-10-09 | 1 | -11/+7 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | completion: add --show-signature for log and showda/completion-show-signature | David Aguilar | 2014-10-07 | 1 | -0/+2 |
* | | | | | | | Merge branch 'tb/complete-diff-ignore-blank-lines' | Junio C Hamano | 2014-09-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: Add --ignore-blank-lines for difftb/complete-diff-ignore-blank-lines | 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 Makefilemb/build-contrib-svn-fe | Maxim Bublis | 2014-08-28 | 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 Makefilejk/contrib-subtree-make-all | 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_DIRjk/prompt-stash-could-be-packed | 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=`jk/more-push-completion | John Keeping | 2014-07-22 | 1 | -1/+21 |