summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-04add '%d' pretty format specifier to show decorationLibravatar René Scharfe2-0/+22
2008-09-04move load_ref_decorations() to log-tree.c and export itLibravatar René Scharfe3-35/+37
2008-09-04log: add load_ref_decorations()Libravatar René Scharfe1-2/+10
2008-09-04Fix AsciiDoc errors in merge documentationLibravatar Johan Herland1-4/+4
2008-09-03diff --cumulative is a sub-option of --dirstatLibravatar Junio C Hamano2-4/+7
2008-09-03safe_create_leading_directories(): make it about "leading" directoriesLibravatar Junio C Hamano1-1/+5
2008-09-03bash completion: Hide more plumbing commandsLibravatar Petr Baudis1-0/+10
2008-09-03merge-recursive: move call_depth to struct merge_optionsLibravatar Miklos Vajna2-13/+13
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-02t5300: improve SHA1 collision testLibravatar Nicolas Pitre1-1/+2
2008-09-02pack-objects: don't include missing preferred base objectsLibravatar Nicolas Pitre1-0/+8
2008-09-02sha1write: don't copy full sized buffersLibravatar Nicolas Pitre1-10/+17
2008-09-02Merge branch 'np/maint-safer-pack' into np/packLibravatar Junio C Hamano6-55/+112
2008-09-02Makefile: add merge_recursive.h to LIB_HLibravatar Miklos Vajna1-0/+1
2008-09-02cherry-pick/revert: make direct internal call to merge_tree()Libravatar Miklos Vajna1-40/+43
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
2008-09-01git gui: show diffs with a minimum of 1 context lineLibravatar Clemens Buchacher3-3/+3
2008-08-31git-merge documentation: describe how conflict is presentedLibravatar Junio C Hamano1-0/+65
2008-08-31checkout --conflict=<style>: recreate merge in a non-default styleLibravatar Junio C Hamano3-48/+72
2008-08-31Merge branch 'tr/rev-list-docs' into tr/filter-branchLibravatar Junio C Hamano4-26/+192
2008-08-31cast pid_t's to uintmax_t to improve portabilityLibravatar David Soria Parra5-9/+9
2008-08-31Merge branch 'maint'Libravatar Junio C Hamano4-3/+6
2008-08-31t6013: replace use of 'tac' with equivalent PerlLibravatar Thomas Rast1-2/+2