summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportLibravatar Junio C Hamano2-3/+40
2012-03-20Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Libravatar Junio C Hamano1-3/+3
2012-03-20Merge branch 'jc/advise-i18n' into maint-1.7.8Libravatar Junio C Hamano2-12/+20
2012-03-20Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Libravatar Junio C Hamano2-1/+11
2012-03-20t4202: add test for "log --graph --stat -p" separator linesLibravatar Lucian Poston1-0/+290
2012-03-20log --graph: fix break in graph linesLibravatar Lucian Poston1-0/+6
2012-03-20log --graph --stat: three-dash separator should come after graph linesLibravatar Lucian Poston1-2/+3
2012-03-19gitk: Speed up resolution of short SHA1 idsLibravatar Paul Mackerras1-5/+27
2012-03-19gitk: Use symbolic font names "sans" and "monospace" when availableLibravatar Jonathan Nieder1-0/+5
2012-03-19gitk: Skip over AUTHOR/COMMIT_DATE when searching all fieldsLibravatar Frédéric Brière1-2/+4
2012-03-19gitk: Make "git describe" output clickable, tooLibravatar Jim Meyering1-1/+5
2012-03-19gitk: Fix the display of files when filtered by pathLibravatar Pat Thoyts1-11/+27
2012-03-19gitk: Use a tabbed dialog to edit preferencesLibravatar Pat Thoyts1-100/+164
2012-03-19gitk: Use "gitk: repo-top-level-dir" as window titleLibravatar Zbigniew Jędrzejewski-Szmek1-1/+12
2012-03-16Merge branch 'ab/perl-i18n'Libravatar Junio C Hamano2-3/+15
2012-03-16perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKERLibravatar Ævar Arnfjörð Bjarmason1-2/+5
2012-03-16Update draft release notes to 1.7.10Libravatar Junio C Hamano1-1/+10
2012-03-16Merge branch 'th/mergetools-deltawalker'Libravatar Junio C Hamano1-2/+3
2012-03-16Merge branch 'jc/maint-verify-objects-remove-pessimism'Libravatar Junio C Hamano1-4/+4
2012-03-16Merge branch 'sl/customize-sane-tool-path'Libravatar Junio C Hamano1-0/+17
2012-03-16Merge "two fixes for fast-import's 'ls' command" from JonathanLibravatar Junio C Hamano2-0/+43
2012-03-16l10n: Update zh_CN translation for Git 1.7.10-rc1Libravatar Jiang Xin1-12/+17
2012-03-16l10n: Update git.pot (1 new message)Libravatar Jiang Xin1-12/+17
2012-03-16Merge v1.7.10-rc0 for git l10n updateLibravatar Jiang Xin21-105/+265
2012-03-15Merge branch 'th/git-diffall'Libravatar Junio C Hamano1-28/+24
2012-03-15Merge branch 'th/doc-diff-submodule-option'Libravatar Junio C Hamano1-5/+6
2012-03-15fetch/receive: remove over-pessimistic connectivity checkLibravatar Junio C Hamano1-4/+4
2012-03-15Documentation/difftool: add deltawalker to list of valid diff toolsLibravatar Tim Henigan1-2/+3
2012-03-15clean: preserve nested git worktree in subdirectoriesLibravatar Junio C Hamano2-11/+43
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdLibravatar Johan Herland2-8/+13
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Libravatar Johan Herland2-21/+31
2012-03-15t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Libravatar Johan Herland1-0/+19
2012-03-15remove_dir_recursively(): Add flag for skipping removal of toplevel dirLibravatar Junio C Hamano2-4/+11
2012-03-14Git 1.7.10-rc1Libravatar Junio C Hamano2-4/+12
2012-03-14contrib/diffall: fix cleanup trap on WindowsLibravatar Tim Henigan1-4/+3
2012-03-14contrib/diffall: eliminate duplicate while loopsLibravatar Tim Henigan1-15/+9
2012-03-14contrib/diffall: eliminate use of tarLibravatar Tim Henigan1-4/+8
2012-03-14contrib/diffall: create tmp dirs without mktempLibravatar Tim Henigan1-7/+4
2012-03-14contrib/diffall: comment actual reason for 'cdup'Libravatar Tim Henigan1-1/+3
2012-03-14diff: tweak a _copy_ of diff_options with word-diffLibravatar Thomas Rast2-2/+5
2012-03-14diff: refactor the word-diff setup from builtin_diff_cmdLibravatar Thomas Rast1-56/+63
2012-03-14t4034: diff.*.wordregex should not be "sticky" in --word-diffLibravatar Johannes Sixt1-0/+36
2012-03-14Documentation/diff-options: reword description of --submodule optionLibravatar Tim Henigan1-5/+6
2012-03-13Merge branch 'jc/i18n-shell-script-gettext'Libravatar Junio C Hamano1-1/+1
2012-03-13Merge branch 'jc/maint-undefined-i18n-observation-test'Libravatar Junio C Hamano1-14/+23
2012-03-13Merge branch 'ms/maint-config-error-at-eol-linecount'Libravatar Junio C Hamano2-4/+40
2012-03-13Merge branch 'ph/rerere-doc'Libravatar Junio C Hamano1-7/+12
2012-03-13am: officially deprecate -b/--binary optionLibravatar Junio C Hamano2-4/+4
2012-03-12Update draft release notes to 1.7.10 before -rc1Libravatar Junio C Hamano1-21/+12
2012-03-12Merge branch 'az/verify-tag-use-gpg-config'Libravatar Junio C Hamano1-1/+9