summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-03-14Merge branch 'mr/autoconf-fread'Libravatar Junio C Hamano2-0/+21
2008-03-14Merge branch 'maint'Libravatar Junio C Hamano7-18/+95
2008-03-14Merge branch 'ph/maint-quiltimport' into maintLibravatar Junio C Hamano1-3/+19
2008-03-13read-tree() and unpack_trees(): use consistent limitLibravatar Junio C Hamano3-8/+9
2008-03-13merge-file: handle empty files gracefullyLibravatar Johannes Schindelin2-3/+4
2008-03-13merge-recursive: handle file mode changesLibravatar Clemens Buchacher2-2/+62
2008-03-13pack-objects: proper pack time stamping with --max-pack-sizeLibravatar Nicolas Pitre2-0/+27
2008-03-13Minor wording changes in the keyboard descriptions in git-add --interactive.Libravatar Vineet Kumar1-10/+8
2008-03-13git fetch: Take '-n' to mean '--no-tags'Libravatar Johannes Schindelin1-0/+2
2008-03-12Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-03-12gc: call "prune --expire 2.weeks.ago" by defaultLibravatar Johannes Schindelin5-32/+73
2008-03-12Documentation/config: typofixLibravatar Junio C Hamano1-1/+1
2008-03-12quiltimport: fix misquoting of parsed -p<num> parameterLibravatar Junio C Hamano1-2/+2
2008-03-12git-cvsimport: fix merging with remote parent branchLibravatar Marc-Andre Lureau1-1/+1
2008-03-12gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' formLibravatar Jakub Narebski1-2/+2
2008-03-11Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano9-573/+724
2008-03-12git-gui: Simplify MSGFMT setting in MakefileLibravatar Junio C Hamano1-6/+1
2008-03-11Merge branch 'js/remote'Libravatar Junio C Hamano12-3/+795
2008-03-11Merge branch 'lt/unpack-trees'Libravatar Junio C Hamano15-452/+503
2008-03-11"remote update": print remote name being fetched fromLibravatar Samuel Tardieu1-0/+1
2008-03-11Merge branch 'maint'Libravatar Junio C Hamano4-3/+37
2008-03-11git-svn: fix find-rev error message when missing argLibravatar Marc-Andre Lureau1-1/+2
2008-03-11t0021: tr portability fix for SolarisLibravatar Jeff King1-1/+3
2008-03-11launch_editor(): allow spaces in the filenameLibravatar Johannes Schindelin2-1/+32
2008-03-11git rebase --abort: always restore the right commitLibravatar Mike Hommey2-3/+73
2008-03-11autoconf: Test FREAD_READS_DIRECTORIESLibravatar Michal Rokos2-0/+21
2008-03-11Merge branch 'jc/cherry-pick' (early part)Libravatar Junio C Hamano6-389/+449
2008-03-11Merge branch 'maint'Libravatar Junio C Hamano1-0/+2
2008-03-11Merge branch 'kb/maint-filter-branch-disappear' into maintLibravatar Junio C Hamano2-1/+34
2008-03-11Merge branch 'aw/maint-shortlog-blank-lines' into maintLibravatar Junio C Hamano1-2/+3
2008-03-10unpack_trees(): fix diff-index regression.Libravatar Linus Torvalds2-2/+18
2008-03-10update 'git rebase' documentationLibravatar SZEDER Gábor2-4/+2
2008-03-10bash: fix long option with argument double completionLibravatar SZEDER Gábor1-7/+15
2008-03-10bash: Add more long options to be completed with "git --<TAB>"Libravatar Teemu Likonen1-0/+3
2008-03-10bash: use __gitdir when completing 'git rebase' optionsLibravatar SZEDER Gábor1-2/+2
2008-03-10bash: Remove completion of core.legacyheaders optionLibravatar Shawn O. Pearce1-1/+0
2008-03-10bash: add 'git svn' subcommands and optionsLibravatar SZEDER Gábor1-1/+80
2008-03-10bash: add new 'git stash' subcommandsLibravatar SZEDER Gábor1-1/+1
2008-03-10bash: refactor searching for subcommands on the command lineLibravatar SZEDER Gábor1-39/+32
2008-03-10bash: remove unnecessary conditions when checking for subcommandsLibravatar SZEDER Gábor1-4/+4
2008-03-10bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with ...Libravatar Kevin Ballard1-4/+4
2008-03-10traverse_trees_recursive(): propagate merge errors upLibravatar Junio C Hamano1-3/+4
2008-03-10git-pull documentation: warn about the option orderLibravatar Junio C Hamano1-0/+2
2008-03-09git-quiltimport: better parser to grok "enhanced" series files.Libravatar Pierre Habouzit1-3/+19
2008-03-09unpack_trees(): minor memory leak fix in unused destination indexLibravatar Linus Torvalds1-0/+1
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds8-153/+102
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds7-39/+52
2008-03-09Add 'const' where appropriate to index handling functionsLibravatar Linus Torvalds4-16/+16
2008-03-09Fix tree-walking compare_entry() in the presense of --prefixLibravatar Linus Torvalds1-0/+3
2008-03-09Move 'unpack_trees()' over to 'traverse_trees()' interfaceLibravatar Linus Torvalds1-281/+249