summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2008-09-08t6023-merge-file: Work around non-portable sed usageArjen Laarhoven
2008-09-08Correct output of git-count-objects.Mikael Magnusson
2008-09-08Windows: git-shell can be compiled againJohannes Sixt
2008-09-08t/t91XX git-svn tests: run "git svn" not "git-svn"Nanako Shiraishi
2008-09-08t/t91XX-svn: start removing use of "git-" from these testsNanako Shiraishi
2008-09-08Merge git://git.bogomips.org/git-svnJunio C Hamano
2008-09-08Merge branch 'ar/autospell'Junio C Hamano
2008-09-08Merge branch 'jc/cc-ld-dynpath'Junio C Hamano
2008-09-08Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano
2008-09-08Merge branch 'jc/maint-checkout-fix'Junio C Hamano
2008-09-07Teach "git diff -p" to locate PHP class methodsAndreas Ericsson
2008-09-07git-svn: fix handling of even funkier branch namesEric Wong
2008-09-07Update draft release notes for 1.6.1Junio C Hamano
2008-09-07Merge git://git.bogomips.org/git-svnJunio C Hamano
2008-09-07git-svn: set auto_props when renaming filesPaul Talacko
2008-09-07t9124: clean up chdir usageEric Wong
2008-09-07Merge updated git-gui and gitk that call each otherJunio C Hamano
2008-09-06Merge branch 'maint'Junio C Hamano
2008-09-06Update draft release notes for 1.6.0.2Junio C Hamano
2008-09-06stash: refresh the index before deciding if the work tree is dirtyJunio C Hamano
2008-09-06Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano
2008-09-05git-svn: fix 'info' tests for unknown itemsThomas Rast
2008-09-05git-svn: match SVN 1.5 behaviour of info' on unknown itemThomas Rast
2008-09-05git svn info: always quote URLs in 'info' outputThomas Rast
2008-09-05git svn info: make info relative to the current directoryThomas Rast
2008-09-05git svn info: tests: fix ptouch argument order in setupThomas Rast
2008-09-05git svn info: tests: use test_cmp instead of git-diffThomas Rast
2008-09-05git svn info: tests: do not use set -eThomas Rast
2008-09-05git svn info: tests: let 'init' test run with SVN 1.5Thomas Rast
2008-09-05git svn: catch lack of upstream info for dcommit earlierThomas Rast
2008-09-05git-svn: check error code of send_txstreamEric Wong
2008-09-05git-svn: Send deltas during commitsFlorian Weimer
2008-09-05git-svn: Introduce SVN::Git::Editor::_chg_file_get_blobFlorian Weimer
2008-09-05git-svn: extract base blob in generate_diffFlorian Weimer
2008-09-05Mention the fact that 'git annotate' is only for backward compatibility.Junio C Hamano
2008-09-05"blame -c" should be compatible with "annotate"Junio C Hamano
2008-09-05Merge branch 'jc/maint-log-grep'Junio C Hamano
2008-09-05log --author/--committer: really match only with name partJunio C Hamano
2008-09-05Merge branch 'maint'Shawn O. Pearce
2008-09-05git-gui: Fix diff parsing for lines starting with "--" or "++"Shawn O. Pearce
2008-09-05git-gui: Show special diffs for complex conflict cases.Alexander Gavrilov
2008-09-05git-gui: Make F5 reselect a diff, if an untracked file is selected.Alexander Gavrilov
2008-09-05git-gui: Reimplement and enhance auto-selection of diffs.Alexander Gavrilov
2008-09-05git-gui: Support conflict states _U & UT.Alexander Gavrilov
2008-09-05git-gui: Support more merge tools.Alexander Gavrilov
2008-09-05git-gui: Don't allow staging files with conflicts.Alexander Gavrilov
2008-09-05git-gui: Support calling merge tools.Alexander Gavrilov
2008-09-05git-gui: Support resolving conflicts via the diff context menu.Alexander Gavrilov
2008-09-05git-gui: Mark forgotten strings for translation.Christian Stimming
2008-09-04diff --cumulative is a sub-option of --dirstatJunio C Hamano