summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-1837-123/+266
|\
| * diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-183-3/+8
| * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-183-12/+15
| * diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey2008-09-181-27/+28
| * Cosmetical command name fixHeikki Orsila2008-09-151-1/+1
| * Start conforming code to "git subcmd" style part 3Heikki Orsila2008-09-159-19/+19
| * t9700/test.pl: remove File::Temp requirementBrandon Casey2008-09-151-10/+13
| * t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()Brandon Casey2008-09-151-1/+1
| * GIT 1.6.0.2v1.6.0.2Junio C Hamano2008-09-122-2/+4
| * Merge branch 'ho/maint-dashless' into maintJunio C Hamano2008-09-125-14/+14
| |\
| | * Start conforming code to "git subcmd" style part 2Heikki Orsila2008-09-095-14/+14
| * | Fix some manual typos.Ralf Wildenhues2008-09-123-3/+3
| * | Use compatibility regex library also on FreeBSDJeff King2008-09-111-0/+2
| * | Use compatibility regex library also on AIXJohannes Sixt2008-09-111-0/+2
| * | Update draft release notes for 1.6.0.2Junio C Hamano2008-09-101-2/+22
| * | Use compatibility regex library for OSX/DarwinArjen Laarhoven2008-09-106-2/+10
| * | git-svn: Fixes my() parameter list syntax error in pre-5.8 PerlMarcus Griep2008-09-101-1/+1
| * | Git.pm: Use File::Temp->tempfile instead of ->newMarcus Griep2008-09-102-14/+32
| * | t7501: always use test_cmp instead of diffMiklos Vajna2008-09-101-6/+6
| * | Merge branch 'jc/maint-log-grep' into maintJunio C Hamano2008-09-104-17/+114
| |\ \
| * \ \ Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maintJunio C Hamano2008-09-103-3/+34
| |\ \ \
| | * | | diff: Help "less" hide ^M from the outputJunio C Hamano2008-08-303-3/+34
| * | | | Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano2008-09-102-1/+50
| |\ \ \ \
| | * | | | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-302-1/+50
| * | | | | Merge branch 'np/maint-safer-pack' into maintJunio C Hamano2008-09-106-55/+112
| |\ \ \ \ \
* | | | | | | 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