| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | | 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-02 | 1 | -3/+11 | |
| | * | | | | | | | | | | | | | | | mergetools: support TortoiseGitMerge | Sven Strickroth | 2013-01-27 | 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-29 | 6 | -52/+34 | |
| | * | | | | | | | | | | | | | | | mergetool--lib: don't call "exit" in setup_tool | John Keeping | 2013-01-28 | 1 | -3/+20 | |
| | * | | | | | | | | | | | | | | | mergetool--lib: improve show_tool_help() output | David Aguilar | 2013-01-28 | 1 | -5/+21 | |
| | * | | | | | | | | | | | | | | | mergetools/vim: remove redundant diff command | David Aguilar | 2013-01-28 | 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-02-01 | 3 | -3/+41 | |
| | * | | | | | | | | | | | | | | | | | docs: clarify git-branch --list behavior | Jeff King | 2013-02-01 | 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-29 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-06 | 1 | -0/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/auto-depend-workaround-buggy-ccache' | Junio C Hamano | 2013-02-06 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Makefile: explicitly set target name for autogenerated dependencies | Jonathan Nieder | 2013-02-02 | 1 | -2/+3 | |
| | | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'ta/doc-no-small-caps' | Junio C Hamano | 2013-02-06 | 137 | -959/+982 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Documentation: StGit is the right spelling, not StGIT | Thomas Ackermann | 2013-02-01 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | Documentation: describe the "repository" in repository-layout | Junio C Hamano | 2013-02-01 | 1 | -6/+18 | |
| | * | | | | | | | | | | | | | | | | | | | | Documentation: add a description for 'gitfile' to glossary | Thomas Ackermann | 2013-02-01 | 1 | -0/+4 | |
| | * | | | | | | | | | | | | | | | | | | | | Documentation: do not use undefined terms git-dir and git-file | Thomas Ackermann | 2013-02-01 | 1 | -3/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 | 128 | -902/+902 | |
| | * | | | | | | | | | | | | | | | | | | | | Documentation: avoid poor-man's small caps GIT | Thomas Ackermann | 2013-02-01 | 28 | -48/+53 | |
| | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-06 | 3 | -17/+45 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | apply: diagnose incomplete submodule object name better | Junio C Hamano | 2013-02-01 | 1 | -1/+5 | |
| | * | | | | | | | | | | | | | | | | | | | apply: simplify build_fake_ancestor() | Junio C Hamano | 2013-02-01 | 1 | -14/+12 | |
| | * | | | | | | | | | | | | | | | | | | | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-02-01 | 2 | -3/+29 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'sb/gpg-plug-fd-leak' | Junio C Hamano | 2013-02-06 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | gpg: close stderr once finished with it in verify_signed_buffer() | Stephen Boyd | 2013-01-31 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'ft/transport-report-segv' | Junio C Hamano | 2013-02-06 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |