aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-07
* wt-status: Split header generation into three functionsAnders Melchiorsen2008-09-07
* Update draft release notes for 1.6.1Junio C Hamano2008-09-06
* Merge git://git.bogomips.org/git-svnJunio C Hamano2008-09-06
|\
| * git-svn: set auto_props when renaming filesPaul Talacko2008-09-06
| * t9124: clean up chdir usageEric Wong2008-09-06
| * git-svn: fix 'info' tests for unknown itemsThomas Rast2008-09-05
| * git-svn: match SVN 1.5 behaviour of info' on unknown itemThomas Rast2008-09-05
| * git svn info: always quote URLs in 'info' outputThomas Rast2008-09-05
| * git svn info: make info relative to the current directoryThomas Rast2008-09-05
| * git svn info: tests: fix ptouch argument order in setupThomas Rast2008-09-05
| * git svn info: tests: use test_cmp instead of git-diffThomas Rast2008-09-05
| * git svn info: tests: do not use set -eThomas Rast2008-09-05
| * git svn info: tests: let 'init' test run with SVN 1.5Thomas Rast2008-09-05
| * git svn: catch lack of upstream info for dcommit earlierThomas Rast2008-09-05
| * git-svn: check error code of send_txstreamEric Wong2008-09-05
| * git-svn: Send deltas during commitsFlorian Weimer2008-09-05
| * git-svn: Introduce SVN::Git::Editor::_chg_file_get_blobFlorian Weimer2008-09-05
| * git-svn: extract base blob in generate_diffFlorian Weimer2008-09-05
| |
| \
*-. \ Merge updated git-gui and gitk that call each otherJunio C Hamano2008-09-06
|\ \ \
| | * | gitk: Add menu item for calling git gui blameAlexander Gavrilov2008-08-26
| | * | gitk: Add option to specify the default commit on command lineAlexander Gavrilov2008-08-26
| * | | Merge branch 'maint'Shawn O. Pearce2008-09-04
| |\ \ \
| * | | | git-gui: Show special diffs for complex conflict cases.Alexander Gavrilov2008-09-04
| * | | | git-gui: Make F5 reselect a diff, if an untracked file is selected.Alexander Gavrilov2008-09-04
| * | | | git-gui: Reimplement and enhance auto-selection of diffs.Alexander Gavrilov2008-09-04
| * | | | git-gui: Support conflict states _U & UT.Alexander Gavrilov2008-09-04
| * | | | git-gui: Support more merge tools.Alexander Gavrilov2008-09-04
| * | | | git-gui: Don't allow staging files with conflicts.Alexander Gavrilov2008-09-04
| * | | | git-gui: Support calling merge tools.Alexander Gavrilov2008-09-04
| * | | | git-gui: Support resolving conflicts via the diff context menu.Alexander Gavrilov2008-09-04
| * | | | git-gui: Mark forgotten strings for translation.Christian Stimming2008-09-04
| * | | | Merge branch 'maint'Shawn O. Pearce2008-09-01
| |\ \ \ \
| * | | | | git-gui: Allow specifying an initial line for git gui blame.Alexander Gavrilov2008-08-24
| * | | | | git-gui: Better positioning in Blame Parent CommitAlexander Gavrilov2008-08-24
| * | | | | git-gui: Support passing blame to a parent commit.Alexander Gavrilov2008-08-24
| * | | | | git-gui: Support starting gitk from Gui BlameAlexander Gavrilov2008-08-24
| * | | | | git-gui: Teach git gui about file type changesGustaf Hendeby2008-08-24
* | | | | | Merge branch 'maint'Junio C Hamano2008-09-06
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update draft release notes for 1.6.0.2Junio C Hamano2008-09-06
| * | | | | stash: refresh the index before deciding if the work tree is dirtyJunio C Hamano2008-09-06
| * | | | | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-09-06
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | git-gui: Fix diff parsing for lines starting with "--" or "++"Shawn O. Pearce2008-09-04
| | | |/ / | | |/| |
| | * | | git-gui: Fix string escaping in po2msg.shAlexander Gavrilov2008-09-01
| | * | | git gui: show diffs with a minimum of 1 context lineClemens Buchacher2008-09-01
| | |/ /
| | * | git-gui: update all remaining translations to French.Alexandre Bourget2008-08-12
| | * | git-gui: Update french translationAlexandre Bourget2008-08-12
| * | | Mention the fact that 'git annotate' is only for backward compatibility.Junio C Hamano2008-09-05
| * | | "blame -c" should be compatible with "annotate"Junio C Hamano2008-09-05
* | | | Merge branch 'jc/maint-log-grep'Junio C Hamano2008-09-04
|\ \ \ \