summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2008-09-07Merge updated git-gui and gitk that call each otherJunio C Hamano
2008-09-06Merge branch 'maint'Junio C Hamano
2008-09-06Update draft release notes for 1.6.0.2Junio C Hamano
2008-09-06stash: refresh the index before deciding if the work tree is dirtyJunio C Hamano
2008-09-06Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano
2008-09-05Mention the fact that 'git annotate' is only for backward compatibility.Junio C Hamano
2008-09-05"blame -c" should be compatible with "annotate"Junio C Hamano
2008-09-05Merge branch 'jc/maint-log-grep'Junio C Hamano
2008-09-05log --author/--committer: really match only with name partJunio C Hamano
2008-09-05Merge branch 'maint'Shawn O. Pearce
2008-09-05git-gui: Fix diff parsing for lines starting with "--" or "++"Shawn O. Pearce
2008-09-05git-gui: Show special diffs for complex conflict cases.Alexander Gavrilov
2008-09-05git-gui: Make F5 reselect a diff, if an untracked file is selected.Alexander Gavrilov
2008-09-05git-gui: Reimplement and enhance auto-selection of diffs.Alexander Gavrilov
2008-09-05git-gui: Support conflict states _U & UT.Alexander Gavrilov
2008-09-05git-gui: Support more merge tools.Alexander Gavrilov
2008-09-05git-gui: Don't allow staging files with conflicts.Alexander Gavrilov
2008-09-05git-gui: Support calling merge tools.Alexander Gavrilov
2008-09-05git-gui: Support resolving conflicts via the diff context menu.Alexander Gavrilov
2008-09-05git-gui: Mark forgotten strings for translation.Christian Stimming
2008-09-04diff --cumulative is a sub-option of --dirstatJunio C Hamano
2008-09-04bash completion: Hide more plumbing commandsPetr Baudis
2008-09-03Update draft release notes for 1.6.1Junio C Hamano
2008-09-03Merge branch 'maint'Junio C Hamano
2008-09-03Start 1.6.0.2 maintenance cycleJunio C Hamano
2008-09-03Merge branch 'nd/worktree' into maintJunio C Hamano
2008-09-03Merge branch 'ho/dashless' into maintJunio C Hamano
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-09-03tests: use "git xyzzy" form (t7000 - t7199)Nanako Shiraishi
2008-09-03Fix passwd(5) ref and reflect that commit doens't use commit-treeJonas Fonseca
2008-09-03improve handling of sideband message displayNicolas Pitre
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi
2008-09-03checkout: fix message when leaving detached HEADJeff King
2008-09-03clone: fix creation of explicitly named target directoryClemens Buchacher
2008-09-03Merge branch 'tr/filter-branch'Junio C Hamano
2008-09-03Merge branch 'np/maint-safer-pack'Junio C Hamano
2008-09-03Merge branch 'rf/man-env'Junio C Hamano
2008-09-03Merge branch 'jc/author-nickname'Junio C Hamano
2008-09-03Merge branch 'dp/pid-uintmax'Junio C Hamano
2008-09-03gitweb: ref markers link to named shortlogsGiuseppe Bilotta
2008-09-03Merge branch 'maint'Junio C Hamano
2008-09-03Makefile: add merge_recursive.h to LIB_HMiklos Vajna
2008-09-02Improve documentation for --dirstat diff optionHeikki Orsila
2008-09-02Bring local clone's origin URL in line with that of a remote cloneJohan Herland
2008-09-02Documentation: minor cleanup in a use case in 'git stash' manualSZEDER Gábor
2008-09-02Documentation: fix disappeared lines in 'git stash' manpageSZEDER Gábor
2008-09-02Documentation: fix reference to a for-each-ref optionSZEDER Gábor
2008-09-01Merge branch 'maint'Shawn O. Pearce
2008-09-01git-gui: Fix string escaping in po2msg.shAlexander Gavrilov