Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-count-objects.txt: describe each line in -v output | Nguyễn Thái Ngọc Duy | 2013-02-08 | 1 | -5/+15 |
* | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-07 | 1 | -5/+15 |
* | Sync with 1.8.1.3 | Junio C Hamano | 2013-02-07 | 2 | -1/+22 |
|\ | |||||
| * | Git 1.8.1.3v1.8.1.3 | Junio C Hamano | 2013-02-07 | 3 | -2/+23 |
| * | Merge branch 'mz/pick-unborn' into maint | Junio C Hamano | 2013-02-07 | 10 | -48/+44 |
| |\ | |||||
| * \ | Merge branch 'nd/fix-perf-parameters-in-tests' into maint | Junio C Hamano | 2013-02-07 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into... | Junio C Hamano | 2013-02-07 | 2 | -2/+34 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ft/transport-report-segv' into maint | Junio C Hamano | 2013-02-07 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sb/gpg-plug-fd-leak' into maint | Junio C Hamano | 2013-02-07 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-07 | 3 | -17/+45 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint | Junio C Hamano | 2013-02-07 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'da/mergetool-docs' | Junio C Hamano | 2013-02-07 | 5 | -72/+159 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: generate a list of valid merge tools | David Aguilar | 2013-02-02 | 5 | -15/+36 |
| * | | | | | | | | | mergetool--lib: list user configured tools in '--tool-help' | John Keeping | 2013-02-02 | 1 | -1/+40 |
| * | | | | | | | | | mergetool--lib: add functions for finding available tools | David Aguilar | 2013-02-02 | 1 | -36/+65 |
| * | | | | | | | | | mergetool--lib: improve the help text in guess_merge_tool() | David Aguilar | 2013-01-29 | 1 | -1/+7 |
| * | | | | | | | | | mergetool--lib: simplify command expressions | David Aguilar | 2013-01-29 | 1 | -23/+15 |
* | | | | | | | | | | Merge branch 'ss/mergetools-tortoise' | Junio C Hamano | 2013-02-07 | 1 | -4/+21 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | mergetools: teach tortoisemerge to handle filenames with SP correctly | Sven Strickroth | 2013-02-01 | 1 | -3/+11 |
| * | | | | | | | | | | mergetools: support TortoiseGitMerge | Sven Strickroth | 2013-01-26 | 1 | -1/+10 |
* | | | | | | | | | | | Merge branch 'jk/mergetool' | Junio C Hamano | 2013-02-07 | 8 | -133/+100 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | mergetools: simplify how we handle "vim" and "defaults" | David Aguilar | 2013-01-28 | 6 | -52/+34 |
| * | | | | | | | | | | mergetool--lib: don't call "exit" in setup_tool | John Keeping | 2013-01-27 | 1 | -3/+20 |
| * | | | | | | | | | | mergetool--lib: improve show_tool_help() output | David Aguilar | 2013-01-27 | 1 | -5/+21 |
| * | | | | | | | | | | mergetools/vim: remove redundant diff command | David Aguilar | 2013-01-27 | 1 | -10/+2 |
| * | | | | | | | | | | git-difftool: use git-mergetool--lib for "--tool-help" | John Keeping | 2013-01-25 | 1 | -48/+7 |
| * | | | | | | | | | | git-mergetool: don't hardcode 'mergetool' in show_tool_help | John Keeping | 2013-01-25 | 1 | -2/+4 |
| * | | | | | | | | | | git-mergetool: remove redundant assignment | John Keeping | 2013-01-25 | 1 | -1/+0 |
| * | | | | | | | | | | git-mergetool: move show_tool_help to mergetool--lib | John Keeping | 2013-01-25 | 2 | -37/+37 |
* | | | | | | | | | | | Merge branch 'jk/doc-makefile-cleanup' | Junio C Hamano | 2013-02-07 | 1 | -9/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Documentation/Makefile: clean up MAN*_TXT lists | Jeff King | 2013-02-01 | 1 | -9/+29 |
* | | | | | | | | | | | | Merge branch 'jk/remote-helpers-doc' | Junio C Hamano | 2013-02-07 | 5 | -7/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Rename {git- => git}remote-helpers.txt | John Keeping | 2013-02-01 | 5 | -7/+23 |
* | | | | | | | | | | | | | Merge branch 'sb/run-command-fd-error-reporting' | Junio C Hamano | 2013-02-07 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | run-command: be more informative about what failed | Stephen Boyd | 2013-02-01 | 1 | -2/+6 |
* | | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases' | Junio C Hamano | 2013-02-07 | 4 | -21/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | branch: let branch filters imply --list | Jeff King | 2013-01-31 | 3 | -3/+41 |
| * | | | | | | | | | | | | | | docs: clarify git-branch --list behavior | Jeff King | 2013-01-31 | 1 | -7/+9 |
| * | | | | | | | | | | | | | | branch: mark more strings for translation | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -5/+6 |
| * | | | | | | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into HEAD | Junio C Hamano | 2013-01-30 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | branch: give a more helpful message on redundant arguments | Nguyễn Thái Ngọc Duy | 2013-01-30 | 2 | -4/+4 |
| * | | | | | | | | | | | | | | | branch: reject -D/-d without branch name | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -2/+4 |
* | | | | | | | | | | | | | | | | Merge branch 'sb/gpg-i18n' | Junio C Hamano | 2013-02-07 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | gpg: allow translation of more error messages | Stephen Boyd | 2013-01-31 | 1 | -3/+3 |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/python-styles' | Junio C Hamano | 2013-02-07 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | CodingGuidelines: add Python coding guidelines | John Keeping | 2013-01-30 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | Merge branch 'ab/gitweb-use-same-scheme' | Junio C Hamano | 2013-02-07 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | gitweb: refer to picon/gravatar images over the same scheme | Andrej E Baranov | 2013-01-28 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-05 | 1 | -0/+24 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/auto-depend-workaround-buggy-ccache' | Junio C Hamano | 2013-02-05 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |