summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-12-12mergetool: Add prompt to continue after failing to merge a fileLibravatar Charles Bailey1-9/+43
2008-11-14Add -y/--no-prompt option to mergetoolLibravatar Charles Bailey3-4/+26
2008-11-14Fix some tab/space inconsistencies in git-mergetool.shLibravatar Charles Bailey1-19/+19
2008-11-13Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-11/+120
2008-11-13Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
2008-11-13date/time: do not get confused by fractional secondsLibravatar Linus Torvalds1-6/+20
2008-11-13Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-227/+810
2008-11-13gitk: Fix linehtag undefined error with file highlightingLibravatar Paul Mackerras1-2/+5
2008-11-13gitk: Fix commit encoding supportLibravatar Alexander Gavrilov1-2/+23
2008-11-13gitk: Fix transient windows on Win32 and MacOSLibravatar Alexander Gavrilov1-13/+31
2008-11-13gitk: Add accelerators to frequently used menu commandsLibravatar Alexander Gavrilov1-7/+29
2008-11-12Update draft release notes to 1.6.1Libravatar Junio C Hamano1-1/+33
2008-11-12Merge branch 'jn/gitweb-customlinks'Libravatar Junio C Hamano1-7/+12
2008-11-12Merge branch 'gb/gitweb-snapshot-pathinfo'Libravatar Junio C Hamano1-8/+63
2008-11-12Merge branch 'ds/uintmax-config' (early part)Libravatar Junio C Hamano3-1/+36
2008-11-12Merge branch 'jk/maint-commit-v-strip'Libravatar Junio C Hamano2-3/+78
2008-11-12Merge branch 'np/pack-safer'Libravatar Junio C Hamano8-49/+224
2008-11-12Merge branch 'mk/maint-cg-push'Libravatar Junio C Hamano3-5/+75
2008-11-12Merge branch 'bc/maint-keep-pack'Libravatar Junio C Hamano7-27/+116
2008-11-12Merge branch 'mv/remote-rename'Libravatar Junio C Hamano5-0/+256
2008-11-12Merge branch 'jk/deny-push-to-current'Libravatar Junio C Hamano3-29/+126
2008-11-12Merge branch 'dl/xdiff'Libravatar Junio C Hamano1-2/+13
2008-11-12Merge branch 'lt/decorate'Libravatar Junio C Hamano8-14/+113
2008-11-12Merge branch 'jk/diff-convfilter'Libravatar Junio C Hamano9-42/+81
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Libravatar Junio C Hamano7-20/+178
2008-11-12Merge branch 'st/tag'Libravatar Junio C Hamano2-7/+23
2008-11-12Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano4-17/+41
2008-11-12t7700: test that 'repack -a' packs alternate packed objectsLibravatar Brandon Casey1-0/+16
2008-11-12git.html: Update the links to stale versionsLibravatar Junio C Hamano1-1/+3
2008-11-12Merge branch 'maint'Libravatar Junio C Hamano8-6/+47
2008-11-12Start 1.6.0.5 cycleLibravatar Junio C Hamano2-1/+22
2008-11-12Fix pack.packSizeLimit and --max-pack-size handlingLibravatar Nicolas Pitre2-2/+16
2008-11-12rev-list documentation: clarify the two parts of history simplificationLibravatar Santi BĂ©jar1-2/+46
2008-11-12Document "git log --simplify-by-decoration"Libravatar Nanako Shiraishi1-0/+8
2008-11-12checkout: Fix "initial checkout" detectionLibravatar Junio C Hamano4-3/+9
2008-11-12commit: Fix stripping of patch in verbose mode.Libravatar Jeff King2-3/+78
2008-11-12Remove the period after the git-check-attr summaryLibravatar Matt Kraai1-1/+1
2008-11-12pack-objects: extend --local to mean ignore non-local loose objects tooLibravatar Brandon Casey3-2/+5
2008-11-12sha1_file.c: split has_loose_object() into local and non-local counterpartsLibravatar Brandon Casey2-6/+14
2008-11-12t7700: demonstrate mishandling of loose objects in an alternate ODBLibravatar Brandon Casey1-0/+19
2008-11-12builtin-gc.c: use new pack_keep bitfield to detect .keep file existenceLibravatar Brandon Casey1-11/+1
2008-11-12repack: do not fall back to incremental repacking with [-a|-A]Libravatar Brandon Casey1-7/+4
2008-11-12repack: don't repack local objects in packs with .keep fileLibravatar Brandon Casey2-2/+2
2008-11-12pack-objects: new option --honor-pack-keepLibravatar Brandon Casey2-0/+12
2008-11-12packed_git: convert pack_local flag into a bitfield and add pack_keepLibravatar Brandon Casey2-1/+7
2008-11-12t7700: demonstrate mishandling of objects in packs with a .keep fileLibravatar Brandon Casey1-0/+38
2008-11-11git-remote: document the migration feature of the rename subcommandLibravatar Miklos Vajna1-0/+4
2008-11-11git-remote rename: migrate from remotes/ and branches/Libravatar Miklos Vajna2-0/+68
2008-11-11git push: Interpret $GIT_DIR/branches in a Cogito compatible wayLibravatar Martin Koegler3-5/+75
2008-11-11git-diff: Add --staged as a synonym for --cached.Libravatar David Symonds2-2/+4