Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sg/completion-gitcomp-nl-for-refs' | Junio C Hamano | 2015-03-26 | 1 | -2/+2 |
|\ | |||||
| * | completion: use __gitcomp_nl() for completing refs | SZEDER Gábor | 2015-03-23 | 1 | -2/+2 |
| * | Merge branch 'av/wincred-with-at-in-username-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+22 |
| |\ | |||||
* | \ | Merge branch 'ct/prompt-untracked-fix' | Junio C Hamano | 2015-03-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | git prompt: use toplevel to find untracked files | Cody A Taylor | 2015-03-15 | 1 | -1/+1 |
* | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix' | Junio C Hamano | 2015-03-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | contrib/completion: escape the forward slash in __git_match_ctag | John Szakmeister | 2015-03-15 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jk/push-config' | Junio C Hamano | 2015-03-23 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | push: allow --follow-tags to be set by config push.followTags | Dave Olszewski | 2015-03-14 | 1 | -0/+1 |
* | | | | | Merge branch 'mg/doc-status-color-slot' | Junio C Hamano | 2015-03-18 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | config,completion: add color.status.unmerged | Michael J Gruber | 2015-03-10 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'sg/completion-remote' | Junio C Hamano | 2015-03-18 | 1 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | completion: simplify __git_remotes() | SZEDER Gábor | 2015-03-06 | 1 | -5/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'av/wincred-with-at-in-username-fix' | Junio C Hamano | 2015-02-18 | 1 | -3/+22 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | wincred: fix get credential if username has "@" | Aleksey Vasenev | 2015-01-26 | 1 | -3/+22 |
* | | | | Merge branch 'cj/log-invert-grep' | Junio C Hamano | 2015-02-11 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | log: teach --invert-grep option | Christoph Junghans | 2015-01-13 | 1 | -1/+1 |
* | | | | Merge branch 'tf/prompt-preserve-exit-status' | Junio C Hamano | 2015-01-14 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | git-prompt: preserve value of $? in all cases | 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 pwd | 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' | 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 continuation | Steffen Prohaska | 2015-01-07 | 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 .sh | 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() | Justin Guenther | 2014-12-13 | 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 options | 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 empty | Paul Smith | 2014-12-03 | 1 | -15/+38 |
| | |_|_|/ / | |/| | | | | |||||
* / | | | | | git-send-email: add --transfer-encoding option | 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 broken | 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 bc | 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" error | 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 install | Sebastian Schuberth | 2014-10-16 | 2 | -0/+74 |
| * | | | | | | | | subtree: add an install-html target | Sebastian Schuberth | 2014-10-16 | 2 | -3/+9 |
| |/ / / / / / / |