summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-09-06Merge updated git-gui and gitk that call each otherLibravatar Junio C Hamano9-120/+943
2008-09-06Merge branch 'maint'Libravatar Junio C Hamano10-388/+477
2008-09-06Update draft release notes for 1.6.0.2Libravatar Junio C Hamano1-3/+20
2008-09-06stash: refresh the index before deciding if the work tree is dirtyLibravatar Junio C Hamano1-0/+3
2008-09-06Merge branch 'maint' of git://repo.or.cz/git-gui into maintLibravatar Junio C Hamano5-381/+431
2008-09-05Mention the fact that 'git annotate' is only for backward compatibility.Libravatar Junio C Hamano1-0/+5
2008-09-05"blame -c" should be compatible with "annotate"Libravatar Junio C Hamano2-4/+18
2008-09-04Merge branch 'jc/maint-log-grep'Libravatar Junio C Hamano7-21/+131
2008-09-04log --author/--committer: really match only with name partLibravatar Junio C Hamano4-17/+114
2008-09-04Merge branch 'maint'Libravatar Shawn O. Pearce1-7/+11
2008-09-04git-gui: Fix diff parsing for lines starting with "--" or "++"Libravatar Shawn O. Pearce1-7/+11
2008-09-04git-gui: Show special diffs for complex conflict cases.Libravatar Alexander Gavrilov1-5/+89
2008-09-04git-gui: Make F5 reselect a diff, if an untracked file is selected.Libravatar Alexander Gavrilov1-9/+35
2008-09-04git-gui: Reimplement and enhance auto-selection of diffs.Libravatar Alexander Gavrilov3-39/+109
2008-09-04git-gui: Support conflict states _U & UT.Libravatar Alexander Gavrilov4-3/+7
2008-09-04git-gui: Support more merge tools.Libravatar Alexander Gavrilov1-0/+27
2008-09-04git-gui: Don't allow staging files with conflicts.Libravatar Alexander Gavrilov1-0/+8
2008-09-04git-gui: Support calling merge tools.Libravatar Alexander Gavrilov3-0/+260
2008-09-04git-gui: Support resolving conflicts via the diff context menu.Libravatar Alexander Gavrilov2-60/+190
2008-09-04git-gui: Mark forgotten strings for translation.Libravatar Christian Stimming1-2/+2
2008-09-03diff --cumulative is a sub-option of --dirstatLibravatar Junio C Hamano2-4/+7
2008-09-03bash completion: Hide more plumbing commandsLibravatar Petr Baudis1-0/+10
2008-09-03Update draft release notes for 1.6.1Libravatar Junio C Hamano1-1/+58
2008-09-03Merge branch 'maint'Libravatar Junio C Hamano110-620/+794
2008-09-03Start 1.6.0.2 maintenance cycleLibravatar Junio C Hamano2-1/+51
2008-09-03Merge branch 'nd/worktree' into maintLibravatar Junio C Hamano8-4/+81
2008-09-03Merge branch 'ho/dashless' into maintLibravatar Junio C Hamano96-578/+578
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi18-99/+99
2008-09-03tests: use "git xyzzy" form (t7000 - t7199)Libravatar Nanako Shiraishi6-183/+183
2008-09-03Fix passwd(5) ref and reflect that commit doens't use commit-treeLibravatar Jonas Fonseca3-6/+6
2008-09-03improve handling of sideband message displayLibravatar Nicolas Pitre1-23/+43
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Libravatar Nanako Shiraishi26-130/+130
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Libravatar Nanako Shiraishi26-103/+103
2008-09-03checkout: fix message when leaving detached HEADLibravatar Jeff King1-6/+4
2008-09-03clone: fix creation of explicitly named target directoryLibravatar Clemens Buchacher2-3/+32
2008-09-02Merge branch 'tr/filter-branch'Libravatar Junio C Hamano6-41/+338
2008-09-02Merge branch 'np/maint-safer-pack'Libravatar Junio C Hamano6-55/+112
2008-09-02Merge branch 'rf/man-env'Libravatar Junio C Hamano2-1/+6
2008-09-02Merge branch 'jc/author-nickname'Libravatar Junio C Hamano2-2/+32
2008-09-02Merge branch 'dp/pid-uintmax'Libravatar Junio C Hamano5-9/+9
2008-09-02gitweb: ref markers link to named shortlogsLibravatar Giuseppe Bilotta2-3/+47
2008-09-02Merge branch 'maint'Libravatar Junio C Hamano6-19/+19
2008-09-02Makefile: add merge_recursive.h to LIB_HLibravatar Miklos Vajna1-0/+1
2008-09-01Improve documentation for --dirstat diff optionLibravatar Heikki Orsila1-6/+5
2008-09-01Bring local clone's origin URL in line with that of a remote cloneLibravatar Johan Herland2-4/+4
2008-09-01Documentation: minor cleanup in a use case in 'git stash' manualLibravatar SZEDER Gábor1-1/+1
2008-09-01Documentation: fix disappeared lines in 'git stash' manpageLibravatar SZEDER Gábor1-7/+7
2008-09-01Documentation: fix reference to a for-each-ref optionLibravatar SZEDER Gábor1-1/+1
2008-09-01Merge branch 'maint'Libravatar Shawn O. Pearce4-5/+5
2008-09-01git-gui: Fix string escaping in po2msg.shLibravatar Alexander Gavrilov1-2/+2