Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
*-. | Merge updated git-gui and gitk that call each other | Junio C Hamano | 2008-09-06 | 9 | -120/+943 |
|\ \ | |||||
| | * | gitk: Add menu item for calling git gui blame | Alexander Gavrilov | 2008-08-26 | 1 | -0/+23 |
| | * | gitk: Add option to specify the default commit on command line | Alexander Gavrilov | 2008-08-26 | 1 | -1/+20 |
| * | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-04 | 1 | -7/+11 |
| |\ \ | |||||
| * | | | git-gui: Show special diffs for complex conflict cases. | Alexander Gavrilov | 2008-09-04 | 1 | -5/+89 |
| * | | | git-gui: Make F5 reselect a diff, if an untracked file is selected. | Alexander Gavrilov | 2008-09-04 | 1 | -9/+35 |
| * | | | git-gui: Reimplement and enhance auto-selection of diffs. | Alexander Gavrilov | 2008-09-04 | 3 | -39/+109 |
| * | | | git-gui: Support conflict states _U & UT. | Alexander Gavrilov | 2008-09-04 | 4 | -3/+7 |
| * | | | git-gui: Support more merge tools. | Alexander Gavrilov | 2008-09-04 | 1 | -0/+27 |
| * | | | git-gui: Don't allow staging files with conflicts. | Alexander Gavrilov | 2008-09-04 | 1 | -0/+8 |
| * | | | git-gui: Support calling merge tools. | Alexander Gavrilov | 2008-09-04 | 3 | -0/+260 |
| * | | | git-gui: Support resolving conflicts via the diff context menu. | Alexander Gavrilov | 2008-09-04 | 2 | -60/+190 |
| * | | | git-gui: Mark forgotten strings for translation. | Christian Stimming | 2008-09-04 | 1 | -2/+2 |
| * | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-01 | 4 | -5/+5 |
| |\ \ \ | |||||
| * | | | | git-gui: Allow specifying an initial line for git gui blame. | Alexander Gavrilov | 2008-08-24 | 3 | -5/+14 |
| * | | | | git-gui: Better positioning in Blame Parent Commit | Alexander Gavrilov | 2008-08-24 | 1 | -4/+61 |
| * | | | | git-gui: Support passing blame to a parent commit. | Alexander Gavrilov | 2008-08-24 | 1 | -10/+38 |
| * | | | | git-gui: Support starting gitk from Gui Blame | Alexander Gavrilov | 2008-08-24 | 3 | -2/+55 |
| * | | | | git-gui: Teach git gui about file type changes | Gustaf Hendeby | 2008-08-24 | 3 | -1/+26 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-06 | 10 | -388/+477 |
|\ \ \ \ \ | |||||
| * | | | | | Update draft release notes for 1.6.0.2 | Junio C Hamano | 2008-09-06 | 1 | -3/+20 |
| * | | | | | stash: refresh the index before deciding if the work tree is dirty | Junio C Hamano | 2008-09-06 | 1 | -0/+3 |
| * | | | | | Merge branch 'maint' of git://repo.or.cz/git-gui into maint | Junio C Hamano | 2008-09-06 | 5 | -381/+431 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | git-gui: Fix diff parsing for lines starting with "--" or "++" | Shawn O. Pearce | 2008-09-04 | 1 | -7/+11 |
| | | |/ / | | |/| | | |||||
| | * | | | git-gui: Fix string escaping in po2msg.sh | Alexander Gavrilov | 2008-09-01 | 1 | -2/+2 |
| | * | | | git gui: show diffs with a minimum of 1 context line | Clemens Buchacher | 2008-09-01 | 3 | -3/+3 |
| | |/ / | |||||
| | * | | git-gui: update all remaining translations to French. | Alexandre Bourget | 2008-08-12 | 1 | -254/+299 |
| | * | | git-gui: Update french translation | Alexandre Bourget | 2008-08-12 | 1 | -126/+127 |
| * | | | Mention the fact that 'git annotate' is only for backward compatibility. | Junio C Hamano | 2008-09-05 | 1 | -0/+5 |
| * | | | "blame -c" should be compatible with "annotate" | Junio C Hamano | 2008-09-05 | 2 | -4/+18 |
* | | | | Merge branch 'jc/maint-log-grep' | Junio C Hamano | 2008-09-04 | 7 | -21/+131 |
|\ \ \ \ | |||||
| * | | | | log --author/--committer: really match only with name part | Junio C Hamano | 2008-09-04 | 4 | -17/+114 |
| |/ / / | |||||
| * | | | diff --cumulative is a sub-option of --dirstat | Junio C Hamano | 2008-09-03 | 2 | -4/+7 |
| * | | | bash completion: Hide more plumbing commands | Petr Baudis | 2008-09-03 | 1 | -0/+10 |
* | | | | Update draft release notes for 1.6.1 | Junio C Hamano | 2008-09-03 | 1 | -1/+58 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-03 | 110 | -620/+794 |
|\ \ \ \ | |/ / / | |||||
| * | | | Start 1.6.0.2 maintenance cycle | Junio C Hamano | 2008-09-03 | 2 | -1/+51 |
| * | | | Merge branch 'nd/worktree' into maint | Junio C Hamano | 2008-09-03 | 8 | -4/+81 |
| |\ \ \ | |||||
| | * | | | setup_git_directory(): fix move to worktree toplevel directory | Nguyễn Thái Ngọc Duy | 2008-08-30 | 1 | -0/+2 |
| | * | | | update-index: fix worktree setup | Nguyễn Thái Ngọc Duy | 2008-08-30 | 1 | -0/+5 |
| | * | | | read-tree: setup worktree if merge is required | Nguyễn Thái Ngọc Duy | 2008-08-28 | 1 | -0/+2 |
| | * | | | grep: fix worktree setup | Nguyễn Thái Ngọc Duy | 2008-08-28 | 2 | -1/+9 |
| | * | | | diff*: fix worktree setup | Nguyễn Thái Ngọc Duy | 2008-08-28 | 4 | -3/+63 |
| * | | | | Merge branch 'ho/dashless' into maint | Junio C Hamano | 2008-09-03 | 96 | -578/+578 |
| |\ \ \ \ | |||||
| | * | | | | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | 18 | -99/+99 |
| | * | | | | tests: use "git xyzzy" form (t7000 - t7199) | Nanako Shiraishi | 2008-09-03 | 6 | -183/+183 |
| | * | | | | tests: use "git xyzzy" form (t3600 - t6999) | Nanako Shiraishi | 2008-09-03 | 26 | -130/+130 |
| | * | | | | tests: use "git xyzzy" form (t0000 - t3599) | Nanako Shiraishi | 2008-09-03 | 26 | -103/+103 |
| | * | | | | 'git foo' program identifies itself without dash in die() messages | Junio C Hamano | 2008-08-31 | 15 | -52/+52 |
| | * | | | | Start conforming code to "git subcmd" style | Heikki Orsila | 2008-08-30 | 6 | -11/+11 |