summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
*-. 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
* | | | | Merge branch 'maint'Junio C Hamano2008-09-0610-388/+477
|\ \ \ \ \
| * | | | | Update draft release notes for 1.6.0.2Junio C Hamano2008-09-061-3/+20
| * | | | | stash: refresh the index before deciding if the work tree is dirtyJunio C Hamano2008-09-061-0/+3
| * | | | | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-09-065-381/+431
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | git-gui: Fix diff parsing for lines starting with "--" or "++"Shawn O. Pearce2008-09-041-7/+11
| | | |/ / | | |/| |
| | * | | git-gui: Fix string escaping in po2msg.shAlexander Gavrilov2008-09-011-2/+2
| | * | | git gui: show diffs with a minimum of 1 context lineClemens Buchacher2008-09-013-3/+3
| | |/ /
| | * | git-gui: update all remaining translations to French.Alexandre Bourget2008-08-121-254/+299
| | * | git-gui: Update french translationAlexandre Bourget2008-08-121-126/+127
| * | | Mention the fact that 'git annotate' is only for backward compatibility.Junio C Hamano2008-09-051-0/+5
| * | | "blame -c" should be compatible with "annotate"Junio C Hamano2008-09-052-4/+18
* | | | Merge branch 'jc/maint-log-grep'Junio C Hamano2008-09-047-21/+131
|\ \ \ \
| * | | | log --author/--committer: really match only with name partJunio C Hamano2008-09-044-17/+114
| |/ / /
| * | | diff --cumulative is a sub-option of --dirstatJunio C Hamano2008-09-032-4/+7
| * | | bash completion: Hide more plumbing commandsPetr Baudis2008-09-031-0/+10
* | | | Update draft release notes for 1.6.1Junio C Hamano2008-09-031-1/+58
* | | | Merge branch 'maint'Junio C Hamano2008-09-03110-620/+794
|\ \ \ \ | |/ / /
| * | | Start 1.6.0.2 maintenance cycleJunio C Hamano2008-09-032-1/+51
| * | | Merge branch 'nd/worktree' into maintJunio C Hamano2008-09-038-4/+81
| |\ \ \
| | * | | setup_git_directory(): fix move to worktree toplevel directoryNguyễn Thái Ngọc Duy2008-08-301-0/+2
| | * | | update-index: fix worktree setupNguyễn Thái Ngọc Duy2008-08-301-0/+5
| | * | | read-tree: setup worktree if merge is requiredNguyễn Thái Ngọc Duy2008-08-281-0/+2
| | * | | grep: fix worktree setupNguyễn Thái Ngọc Duy2008-08-282-1/+9
| | * | | diff*: fix worktree setupNguyễn Thái Ngọc Duy2008-08-284-3/+63
| * | | | Merge branch 'ho/dashless' into maintJunio C Hamano2008-09-0396-578/+578
| |\ \ \ \
| | * | | | tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-0318-99/+99
| | * | | | tests: use "git xyzzy" form (t7000 - t7199)Nanako Shiraishi2008-09-036-183/+183
| | * | | | tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-0326-130/+130
| | * | | | tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-0326-103/+103
| | * | | | 'git foo' program identifies itself without dash in die() messagesJunio C Hamano2008-08-3115-52/+52
| | * | | | Start conforming code to "git subcmd" styleHeikki Orsila2008-08-306-11/+11