summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t/t91XX-svn: start removing use of "git-" from these testsNanako Shiraishi2008-09-0810-55/+58
* Merge git://git.bogomips.org/git-svnJunio C Hamano2008-09-082-0/+17
|\
| * git-svn: fix handling of even funkier branch namesEric Wong2008-09-062-0/+17
* | Merge branch 'ar/autospell'Junio C Hamano2008-09-078-4/+159
|\ \
| * | Add help.autocorrect to enable/disable autocorrectingAlex Riesen2008-08-312-1/+27
| * | git wrapper: DWIM mistyped commandsJohannes Schindelin2008-08-317-4/+133
* | | Merge branch 'jc/cc-ld-dynpath'Junio C Hamano2008-09-073-8/+42
|\ \ \
| * | | configure: auto detect dynamic library path switchesGiovanni Funchal2008-08-172-0/+33
| * | | Makefile: Allow CC_LD_DYNPATH to be overridenJunio C Hamano2008-08-171-8/+9
* | | | Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano2008-09-073-3/+34
|\ \ \ \
| * | | | diff: Help "less" hide ^M from the outputJunio C Hamano2008-08-303-3/+34
* | | | | Merge branch 'jc/maint-checkout-fix'Junio C Hamano2008-09-072-1/+50
|\ \ \ \ \
| * | | | | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-302-1/+50
* | | | | | Teach "git diff -p" to locate PHP class methodsAndreas Ericsson2008-09-072-2/+5
* | | | | | Update draft release notes for 1.6.1Junio C Hamano2008-09-061-2/+7
* | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2008-09-063-119/+164
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | git-svn: set auto_props when renaming filesPaul Talacko2008-09-062-0/+18
| * | | | | t9124: clean up chdir usageEric Wong2008-09-061-4/+2
| * | | | | git-svn: fix 'info' tests for unknown itemsThomas Rast2008-09-051-48/+25
| * | | | | git-svn: match SVN 1.5 behaviour of info' on unknown itemThomas Rast2008-09-051-2/+2
| * | | | | git svn info: always quote URLs in 'info' outputThomas Rast2008-09-052-17/+38
| * | | | | git svn info: make info relative to the current directoryThomas Rast2008-09-052-3/+16
| * | | | | git svn info: tests: fix ptouch argument order in setupThomas Rast2008-09-051-4/+4
| * | | | | git svn info: tests: use test_cmp instead of git-diffThomas Rast2008-09-051-22/+22
| * | | | | git svn info: tests: do not use set -eThomas Rast2008-09-051-2/+0
| * | | | | git svn info: tests: let 'init' test run with SVN 1.5Thomas Rast2008-09-051-2/+2
| * | | | | git svn: catch lack of upstream info for dcommit earlierThomas Rast2008-09-051-4/+4
| * | | | | git-svn: check error code of send_txstreamEric Wong2008-09-051-1/+5
| * | | | | git-svn: Send deltas during commitsFlorian Weimer2008-09-051-5/+13
| * | | | | git-svn: Introduce SVN::Git::Editor::_chg_file_get_blobFlorian Weimer2008-09-051-12/+19
| * | | | | git-svn: extract base blob in generate_diffFlorian Weimer2008-09-051-3/+4
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Merge updated git-gui and gitk that call each otherJunio C Hamano2008-09-069-120/+943
|\ \ \ \ \ \ \
| | * | | | | | gitk: Add menu item for calling git gui blameAlexander Gavrilov2008-08-261-0/+23
| | * | | | | | gitk: Add option to specify the default commit on command lineAlexander Gavrilov2008-08-261-1/+20
| * | | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-041-7/+11
| |\ \ \ \ \ \ \
| * | | | | | | | git-gui: Show special diffs for complex conflict cases.Alexander Gavrilov2008-09-041-5/+89
| * | | | | | | | git-gui: Make F5 reselect a diff, if an untracked file is selected.Alexander Gavrilov2008-09-041-9/+35
| * | | | | | | | git-gui: Reimplement and enhance auto-selection of diffs.Alexander Gavrilov2008-09-043-39/+109
| * | | | | | | | git-gui: Support conflict states _U & UT.Alexander Gavrilov2008-09-044-3/+7
| * | | | | | | | git-gui: Support more merge tools.Alexander Gavrilov2008-09-041-0/+27
| * | | | | | | | git-gui: Don't allow staging files with conflicts.Alexander Gavrilov2008-09-041-0/+8
| * | | | | | | | git-gui: Support calling merge tools.Alexander Gavrilov2008-09-043-0/+260
| * | | | | | | | git-gui: Support resolving conflicts via the diff context menu.Alexander Gavrilov2008-09-042-60/+190
| * | | | | | | | git-gui: Mark forgotten strings for translation.Christian Stimming2008-09-041-2/+2
| * | | | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-014-5/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | git-gui: Allow specifying an initial line for git gui blame.Alexander Gavrilov2008-08-243-5/+14
| * | | | | | | | | git-gui: Better positioning in Blame Parent CommitAlexander Gavrilov2008-08-241-4/+61
| * | | | | | | | | git-gui: Support passing blame to a parent commit.Alexander Gavrilov2008-08-241-10/+38
| * | | | | | | | | git-gui: Support starting gitk from Gui BlameAlexander Gavrilov2008-08-243-2/+55
| * | | | | | | | | git-gui: Teach git gui about file type changesGustaf Hendeby2008-08-243-1/+26