summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-09-09refs: improve comments about "reading" argument of "resolve_ref"Libravatar Christian Couder1-7/+13
2008-09-08t6023-merge-file: Work around non-portable sed usageLibravatar Arjen Laarhoven1-2/+2
2008-09-08Correct output of git-count-objects.Libravatar Mikael Magnusson1-1/+1
2008-09-08Windows: git-shell can be compiled againLibravatar Johannes Sixt1-1/+1
2008-09-08t/t91XX git-svn tests: run "git svn" not "git-svn"Libravatar Nanako Shiraishi27-174/+174
2008-09-08t/t91XX-svn: start removing use of "git-" from these testsLibravatar Nanako Shiraishi10-55/+58
2008-09-08Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano2-0/+17
2008-09-07Merge branch 'ar/autospell'Libravatar Junio C Hamano8-4/+159
2008-09-07Merge branch 'jc/cc-ld-dynpath'Libravatar Junio C Hamano3-8/+42
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Libravatar Junio C Hamano3-3/+34
2008-09-07Merge branch 'jc/maint-checkout-fix'Libravatar Junio C Hamano2-1/+50
2008-09-07Teach "git diff -p" to locate PHP class methodsLibravatar Andreas Ericsson2-2/+5
2008-09-06git-svn: fix handling of even funkier branch namesLibravatar Eric Wong2-0/+17
2008-09-06Update draft release notes for 1.6.1Libravatar Junio C Hamano1-2/+7
2008-09-06Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-119/+164
2008-09-06git-svn: set auto_props when renaming filesLibravatar Paul Talacko2-0/+18
2008-09-06t9124: clean up chdir usageLibravatar Eric Wong1-4/+2
2008-09-06Merge updated git-gui and gitk that call each otherLibravatar Junio C Hamano9-120/+943
2008-09-06Merge branch 'maint'Libravatar Junio C Hamano10-388/+477
2008-09-06Update draft release notes for 1.6.0.2Libravatar Junio C Hamano1-3/+20
2008-09-06stash: refresh the index before deciding if the work tree is dirtyLibravatar Junio C Hamano1-0/+3
2008-09-06Merge branch 'maint' of git://repo.or.cz/git-gui into maintLibravatar Junio C Hamano5-381/+431
2008-09-05git-svn: fix 'info' tests for unknown itemsLibravatar Thomas Rast1-48/+25
2008-09-05git-svn: match SVN 1.5 behaviour of info' on unknown itemLibravatar Thomas Rast1-2/+2
2008-09-05git svn info: always quote URLs in 'info' outputLibravatar Thomas Rast2-17/+38
2008-09-05git svn info: make info relative to the current directoryLibravatar Thomas Rast2-3/+16
2008-09-05git svn info: tests: fix ptouch argument order in setupLibravatar Thomas Rast1-4/+4
2008-09-05git svn info: tests: use test_cmp instead of git-diffLibravatar Thomas Rast1-22/+22
2008-09-05git svn info: tests: do not use set -eLibravatar Thomas Rast1-2/+0
2008-09-05git svn info: tests: let 'init' test run with SVN 1.5Libravatar Thomas Rast1-2/+2
2008-09-05git svn: catch lack of upstream info for dcommit earlierLibravatar Thomas Rast1-4/+4
2008-09-05git-svn: check error code of send_txstreamLibravatar Eric Wong1-1/+5
2008-09-05git-svn: Send deltas during commitsLibravatar Florian Weimer1-5/+13
2008-09-05git-svn: Introduce SVN::Git::Editor::_chg_file_get_blobLibravatar Florian Weimer1-12/+19
2008-09-05git-svn: extract base blob in generate_diffLibravatar Florian Weimer1-3/+4
2008-09-05Mention the fact that 'git annotate' is only for backward compatibility.Libravatar Junio C Hamano1-0/+5
2008-09-05"blame -c" should be compatible with "annotate"Libravatar Junio C Hamano2-4/+18
2008-09-04Merge branch 'jc/maint-log-grep'Libravatar Junio C Hamano7-21/+131
2008-09-04log --author/--committer: really match only with name partLibravatar Junio C Hamano4-17/+114
2008-09-04Merge branch 'maint'Libravatar Shawn O. Pearce1-7/+11
2008-09-04git-gui: Fix diff parsing for lines starting with "--" or "++"Libravatar Shawn O. Pearce1-7/+11
2008-09-04git-gui: Show special diffs for complex conflict cases.Libravatar Alexander Gavrilov1-5/+89
2008-09-04git-gui: Make F5 reselect a diff, if an untracked file is selected.Libravatar Alexander Gavrilov1-9/+35
2008-09-04git-gui: Reimplement and enhance auto-selection of diffs.Libravatar Alexander Gavrilov3-39/+109
2008-09-04git-gui: Support conflict states _U & UT.Libravatar Alexander Gavrilov4-3/+7
2008-09-04git-gui: Support more merge tools.Libravatar Alexander Gavrilov1-0/+27
2008-09-04git-gui: Don't allow staging files with conflicts.Libravatar Alexander Gavrilov1-0/+8
2008-09-04git-gui: Support calling merge tools.Libravatar Alexander Gavrilov3-0/+260
2008-09-04git-gui: Support resolving conflicts via the diff context menu.Libravatar Alexander Gavrilov2-60/+190
2008-09-04git-gui: Mark forgotten strings for translation.Libravatar Christian Stimming1-2/+2