aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | l10n: de.po: fix some minor issuesRalf Thielow2013-01-23
| * | | | | | | | | | | | | | | | | l10n: Update git.pot (11 new, 7 removed messages)Jiang Xin2013-01-25
* | | | | | | | | | | | | | | | | | Merge branch 'jc/combine-diff-many-parents'Junio C Hamano2013-02-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-05
| * | | | | | | | | | | | | | | | | | combine-diff: lift 32-way limit of combined diffJunio C Hamano2013-02-03
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-03
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'mk/tcsh-complete-only-known-paths'Junio C Hamano2013-02-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | completion: handle path completion and colon for tcsh scriptMarc Khouzam2013-02-03
* | | | | | | | | | | | | | | | | | | Merge branch 'mp/complete-paths'Junio C Hamano2013-02-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | git-completion.bash: add support for path completionManlio Perillo2013-01-11
* | | | | | | | | | | | | | | | | | | Merge branch 'ct/autoconf-htmldir'Junio C Hamano2013-02-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Honor configure's htmldir switchChristoph J. Thompson2013-02-02
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-07
* | | | | | | | | | | | | | | | | | Sync with 1.8.1.3Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Git 1.8.1.3v1.8.1.3Junio C Hamano2013-02-07
| * | | | | | | | | | | | | | | | | Merge branch 'mz/pick-unborn' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2013-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ft/transport-report-segv' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/gpg-plug-fd-leak' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano2013-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-docs'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | doc: generate a list of valid merge toolsDavid Aguilar2013-02-02
| * | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: list user configured tools in '--tool-help'John Keeping2013-02-02
| * | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: add functions for finding available toolsDavid Aguilar2013-02-02
| * | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: improve the help text in guess_merge_tool()David Aguilar2013-01-29
| * | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: simplify command expressionsDavid Aguilar2013-01-29
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/mergetools-tortoise'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth2013-02-01
| * | | | | | | | | | | | | | | | | | | | | | | | mergetools: support TortoiseGitMergeSven Strickroth2013-01-26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/mergetool'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-28
| * | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: don't call "exit" in setup_toolJohn Keeping2013-01-27
| * | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: improve show_tool_help() outputDavid Aguilar2013-01-27
| * | | | | | | | | | | | | | | | | | | | | | | mergetools/vim: remove redundant diff commandDavid Aguilar2013-01-27
| * | | | | | | | | | | | | | | | | | | | | | | git-difftool: use git-mergetool--lib for "--tool-help"John Keeping2013-01-25
| * | | | | | | | | | | | | | | | | | | | | | | git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping2013-01-25
| * | | | | | | | | | | | | | | | | | | | | | | git-mergetool: remove redundant assignmentJohn Keeping2013-01-25
| * | | | | | | | | | | | | | | | | | | | | | | git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-25
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/doc-makefile-cleanup'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Documentation/Makefile: clean up MAN*_TXT listsJeff King2013-02-01
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/remote-helpers-doc'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Rename {git- => git}remote-helpers.txtJohn Keeping2013-02-01
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/run-command-fd-error-reporting'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | run-command: be more informative about what failedStephen Boyd2013-02-01
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | branch: let branch filters imply --listJeff King2013-01-31
| * | | | | | | | | | | | | | | | | | | | | | | | | docs: clarify git-branch --list behaviorJeff King2013-01-31