Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | shell-prompt: clean up nested if-then | Martin Erik Werner | 2013-02-18 | 1 | -14/+13 |
* | Merge branch 'mp/diff-algo-config' | Junio C Hamano | 2013-02-17 | 1 | -1/+13 |
|\ | |||||
| * | diff: Introduce --diff-algorithm command line option | Michal Privoznik | 2013-01-16 | 1 | -0/+11 |
| * | config: Introduce diff.algorithm variable | Michal Privoznik | 2013-01-16 | 1 | -0/+1 |
| * | git-completion.bash: Autocomplete --minimal and --histogram for git-diff | Michal Privoznik | 2013-01-14 | 1 | -1/+1 |
* | | Merge branch 'mw/bash-prompt-show-untracked-config' | Junio C Hamano | 2013-02-17 | 1 | -3/+8 |
|\ \ | |||||
| * | | shell prompt: add bash.showUntrackedFiles option | Martin Erik Werner | 2013-02-13 | 1 | -3/+8 |
* | | | Merge branch 'mm/config-local-completion' | Junio C Hamano | 2013-02-14 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | completion: support 'git config --local' | Matthieu Moy | 2013-02-12 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'mm/remote-mediawiki-build' | Junio C Hamano | 2013-02-14 | 3 | -40/+11 |
|\ \ \ | |||||
| * | | | git-remote-mediawiki: use toplevel's Makefile | Matthieu Moy | 2013-02-08 | 3 | -40/+11 |
* | | | | Merge branch 'dg/subtree-fixes' | Junio C Hamano | 2013-02-14 | 4 | -66/+40 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | contrib/subtree: make the manual directory if needed | Jesper L. Nielsen | 2013-02-05 | 1 | -0/+1 |
| * | | | contrib/subtree: honor DESTDIR | Adam Tkac | 2013-02-05 | 1 | -2/+2 |
| * | | | contrib/subtree: fix synopsis | David A. Greene | 2013-02-05 | 2 | -1/+8 |
| * | | | contrib/subtree: better error handling for 'subtree add' | David A. Greene | 2013-02-05 | 1 | -3/+9 |
| * | | | contrib/subtree: use %B for split subject/body | Techlive Zheng | 2013-02-05 | 2 | -5/+20 |
| * | | | contrib/subtree: remove test number comments | David A. Greene | 2013-02-05 | 1 | -55/+0 |
* | | | | Merge branch 'mk/tcsh-complete-only-known-paths' | Junio C Hamano | 2013-02-08 | 1 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | completion: handle path completion and colon for tcsh script | Marc Khouzam | 2013-02-03 | 1 | -0/+12 |
* | | | | | Merge branch 'mp/complete-paths' | Junio C Hamano | 2013-02-08 | 1 | -15/+240 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | git-completion.bash: add support for path completion | Manlio Perillo | 2013-01-11 | 1 | -15/+240 |
* | | | | Merge branch 'jk/remote-helpers-in-python-3' | Junio C Hamano | 2013-02-04 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | svn-fe: allow svnrdump_sim.py to run with Python 3 | John Keeping | 2013-01-24 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' | Junio C Hamano | 2013-02-01 | 1 | -1/+10 |
|\ \ \ \ | |||||
| * | | | | t9902: protect test from stray build artifacts | Junio C Hamano | 2013-01-24 | 1 | -1/+10 |
* | | | | | Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | git-completion.bash: replace zsh notation that breaks bash 3.X | Brandon Casey | 2013-01-18 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'jk/complete-commit-c' into maint | Junio C Hamano | 2013-01-14 | 1 | -0/+7 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'ch/add-auto-submitted-in-sample-post-receive-email' | Junio C Hamano | 2013-01-23 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add Auto-Submitted header to post-receive-email | Chris Hiestand | 2013-01-17 | 1 | -0/+1 |
* | | | | | | | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-01-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add git-check-ignore sub-command | Adam Spiers | 2013-01-06 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'mh/remote-hg-mode-bits-fix' | Junio C Hamano | 2013-01-21 | 2 | -1/+69 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote-hg: fix handling of file perms when pushing | Max Horn | 2013-01-15 | 2 | -1/+69 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fc/remote-hg-fixup-url' | Junio C Hamano | 2013-01-21 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote-hg: store converted URL | Felipe Contreras | 2013-01-15 | 1 | -0/+11 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ds/completion-silence-in-tree-path-probe' | Junio C Hamano | 2013-01-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-completion.bash: silence "not a valid object" errors | Dylan Smith | 2013-01-11 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jn/maint-trim-vim-contrib' | Junio C Hamano | 2013-01-18 | 1 | -13/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | contrib/vim: simplify instructions for old vim support | Jonathan Nieder | 2013-01-10 | 1 | -13/+3 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mk/complete-tcsh' | Junio C Hamano | 2013-01-18 | 1 | -12/+21 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Prevent space after directories in tcsh completion | Marc Khouzam | 2013-01-07 | 1 | -12/+21 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'fc/remote-bzr' | Junio C Hamano | 2013-01-09 | 2 | -0/+868 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote-bzr: detect local repositories | Felipe Contreras | 2013-01-02 | 1 | -20/+28 |
| * | | | | | | | remote-bzr: add support for older versions of bzr | Felipe Contreras | 2013-01-02 | 1 | -5/+9 |
| * | | | | | | | remote-bzr: add support to push special modes | Felipe Contreras | 2013-01-02 | 1 | -17/+43 |
| * | | | | | | | remote-bzr: add support for fecthing special modes | Felipe Contreras | 2013-01-02 | 2 | -11/+59 |
| * | | | | | | | remote-bzr: add simple tests | Felipe Contreras | 2013-01-02 | 1 | -0/+111 |
| * | | | | | | | remote-bzr: update working tree upon pushing | Felipe Contreras | 2012-12-13 | 1 | -0/+2 |