summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-count-objects.txt: describe each line in -v outputNguyễn Thái Ngọc Duy2013-02-081-5/+15
* Update draft release notes to 1.8.2Junio C Hamano2013-02-071-5/+15
* Sync with 1.8.1.3Junio C Hamano2013-02-072-1/+22
|\
| * Git 1.8.1.3v1.8.1.3Junio C Hamano2013-02-073-2/+23
| * Merge branch 'mz/pick-unborn' into maintJunio C Hamano2013-02-0710-48/+44
| |\
| * \ Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano2013-02-071-1/+1
| |\ \
| * \ \ Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2013-02-072-2/+34
| |\ \ \
| * \ \ \ Merge branch 'ft/transport-report-segv' into maintJunio C Hamano2013-02-071-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/gpg-plug-fd-leak' into maintJunio C Hamano2013-02-071-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-073-17/+45
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano2013-02-071-2/+3
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'da/mergetool-docs'Junio C Hamano2013-02-075-72/+159
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: generate a list of valid merge toolsDavid Aguilar2013-02-025-15/+36
| * | | | | | | | | mergetool--lib: list user configured tools in '--tool-help'John Keeping2013-02-021-1/+40
| * | | | | | | | | mergetool--lib: add functions for finding available toolsDavid Aguilar2013-02-021-36/+65
| * | | | | | | | | mergetool--lib: improve the help text in guess_merge_tool()David Aguilar2013-01-291-1/+7
| * | | | | | | | | mergetool--lib: simplify command expressionsDavid Aguilar2013-01-291-23/+15
* | | | | | | | | | Merge branch 'ss/mergetools-tortoise'Junio C Hamano2013-02-071-4/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth2013-02-011-3/+11
| * | | | | | | | | | mergetools: support TortoiseGitMergeSven Strickroth2013-01-261-1/+10
* | | | | | | | | | | Merge branch 'jk/mergetool'Junio C Hamano2013-02-078-133/+100
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-286-52/+34
| * | | | | | | | | | mergetool--lib: don't call "exit" in setup_toolJohn Keeping2013-01-271-3/+20
| * | | | | | | | | | mergetool--lib: improve show_tool_help() outputDavid Aguilar2013-01-271-5/+21
| * | | | | | | | | | mergetools/vim: remove redundant diff commandDavid Aguilar2013-01-271-10/+2
| * | | | | | | | | | git-difftool: use git-mergetool--lib for "--tool-help"John Keeping2013-01-251-48/+7
| * | | | | | | | | | git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping2013-01-251-2/+4
| * | | | | | | | | | git-mergetool: remove redundant assignmentJohn Keeping2013-01-251-1/+0
| * | | | | | | | | | git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-252-37/+37
* | | | | | | | | | | Merge branch 'jk/doc-makefile-cleanup'Junio C Hamano2013-02-071-9/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/Makefile: clean up MAN*_TXT listsJeff King2013-02-011-9/+29
* | | | | | | | | | | | Merge branch 'jk/remote-helpers-doc'Junio C Hamano2013-02-075-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Rename {git- => git}remote-helpers.txtJohn Keeping2013-02-015-7/+23
* | | | | | | | | | | | | Merge branch 'sb/run-command-fd-error-reporting'Junio C Hamano2013-02-071-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | run-command: be more informative about what failedStephen Boyd2013-02-011-2/+6
* | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-074-21/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | branch: let branch filters imply --listJeff King2013-01-313-3/+41
| * | | | | | | | | | | | | | docs: clarify git-branch --list behaviorJeff King2013-01-311-7/+9
| * | | | | | | | | | | | | | branch: mark more strings for translationNguyễn Thái Ngọc Duy2013-01-301-5/+6
| * | | | | | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into HEADJunio C Hamano2013-01-301-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-302-4/+4
| * | | | | | | | | | | | | | | branch: reject -D/-d without branch nameNguyễn Thái Ngọc Duy2013-01-301-2/+4
* | | | | | | | | | | | | | | | Merge branch 'sb/gpg-i18n'Junio C Hamano2013-02-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | gpg: allow translation of more error messagesStephen Boyd2013-01-311-3/+3
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/python-styles'Junio C Hamano2013-02-071-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | CodingGuidelines: add Python coding guidelinesJohn Keeping2013-01-301-0/+14
* | | | | | | | | | | | | | | | | Merge branch 'ab/gitweb-use-same-scheme'Junio C Hamano2013-02-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gitweb: refer to picon/gravatar images over the same schemeAndrej E Baranov2013-01-281-2/+2
* | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-051-0/+24
* | | | | | | | | | | | | | | | | | Merge branch 'jn/auto-depend-workaround-buggy-ccache'Junio C Hamano2013-02-051-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |