summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-09-29Merge branch 'maint'Libravatar Junio C Hamano5-12/+22
2007-09-29git-remote: exit with non-zero status after detecting errors.Libravatar Jari Aalto1-4/+10
2007-09-29rebase -i: squash should retain the authorship of the _first_ commitLibravatar Johannes Schindelin3-3/+3
2007-09-29rebase -i: support single-letter abbreviations for the actionsLibravatar Johannes Schindelin1-4/+4
2007-09-29git-add--interactive: Improve behavior on bogus inputLibravatar Jean-Luc Herren1-4/+3
2007-09-29git-add--interactive: Allow Ctrl-D to exitLibravatar Jean-Luc Herren1-1/+6
2007-09-29Allow abbreviations in the first refspec to be mergedLibravatar Daniel Barkalow1-1/+1
2007-09-29Make read_patch_file work on a strbuf.Libravatar Pierre Habouzit1-16/+11
2007-09-29strbuf_read_file enhancement, and use it.Libravatar Pierre Habouzit5-31/+14
2007-09-29post-checkout hook, tests, and docsLibravatar Josh England3-0/+100
2007-09-29Make for-each-ref's grab_date() support per-atom formattingLibravatar Andy Parkins2-7/+26
2007-09-29Make for-each-ref allow atom names like "<name>:<something>"Libravatar Andy Parkins1-1/+10
2007-09-29parse_date_format(): convert a format name to an enum date_modeLibravatar Andy Parkins3-16/+22
2007-09-29Merge branch 'gr/smtp'Libravatar Junio C Hamano2-7/+31
2007-09-29Merge branch 'ss/svnimport'Libravatar Junio C Hamano1-11/+12
2007-09-29Merge branch 'sv/svn'Libravatar Junio C Hamano2-4/+6
2007-09-29Merge branch 'ml/submodule'Libravatar Junio C Hamano2-6/+50
2007-09-29Merge branch 'jb/remote-rm'Libravatar Junio C Hamano3-0/+142
2007-09-29Merge branch 'jk/diff-rename'Libravatar Junio C Hamano3-4/+11
2007-09-29Sync with GIT 1.5.3.3Libravatar Junio C Hamano10-40/+115
2007-09-29GIT 1.5.3.3Libravatar Junio C Hamano2-1/+38
2007-09-29Fix revision log diff setup, avoid unnecessary diff generationLibravatar Linus Torvalds1-2/+8
2007-09-29git-bundle: fix commandline examples in the manpageLibravatar Miklos Vajna1-0/+8
2007-09-29Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maintLibravatar Junio C Hamano1-7/+8
2007-09-29strbuf change: be sure ->buf is never ever NULL.Libravatar Pierre Habouzit13-47/+48
2007-09-29double free in builtin-update-index.cLibravatar Pierre Habouzit1-2/+0
2007-09-28mergetool: Fix typo in options passed to kdiff3Libravatar Theodore Ts'o1-2/+2
2007-09-28mergetool: fix emerge when running in a subdirectoryLibravatar Theodore Ts'o1-2/+2
2007-09-28Mergetool generating blank files (1.5.3)Libravatar Junio C Hamano1-3/+4
2007-09-27quiltimport: Skip non-existent patchesLibravatar Dan Nicholson1-0/+4
2007-09-27Clean up stripspace a bit, use strbuf even more.Libravatar Kristian Høgsberg4-36/+28
2007-09-27Add strbuf_read_file().Libravatar Kristian Høgsberg3-8/+19
2007-09-26rerere: Fix use of an empty strbuf.bufLibravatar Junio C Hamano1-2/+4
2007-09-26apply: get rid of --index-info in favor of --build-fake-ancestorLibravatar Johannes Schindelin3-21/+31
2007-09-26Move make_cache_entry() from merge-recursive.c into read-cache.cLibravatar Carlos Rica3-24/+26
2007-09-26send-email --smtp-server-port: allow overriding the default portLibravatar Junio C Hamano2-7/+31
2007-09-26Small cache_tree_write refactor.Libravatar Pierre Habouzit3-25/+15
2007-09-26Make builtin-rerere use of strbuf nicer and more efficient.Libravatar Pierre Habouzit1-25/+18
2007-09-26Add strbuf_cmp.Libravatar Pierre Habouzit2-0/+13
2007-09-26strbuf_setlen(): do not barf on setting length of an empty buffer to 0Libravatar Junio C Hamano1-3/+6
2007-09-26rebase -i: work on a detached HEADLibravatar Johannes Schindelin2-8/+23
2007-09-26Merge branch 'jc/autogc' into js/rebase-iLibravatar Junio C Hamano11-14/+276
2007-09-26Don't use "<unknown>" for placeholders and suppress printing of empty user fo...Libravatar Michal Vitecek6-16/+11
2007-09-26diffcore-rename: cache file deltasLibravatar Jeff King3-4/+11
2007-09-26rebase -i: create .dotest-merge after validating options.Libravatar Matt Kraai1-4/+4
2007-09-25core-tutorial: correct URLLibravatar Randy Dunlap1-1/+2
2007-09-25Fix spelling of overridden in documentationLibravatar Shawn Bohrer2-2/+2
2007-09-25rebase -i: avoid exporting GIT_AUTHOR_* variablesLibravatar Johannes Schindelin1-2/+8
2007-09-25rebase -i: Fix numbers in progress reportLibravatar Johannes Schindelin1-2/+2
2007-09-25rebase -i: style fixes and minor cleanupsLibravatar Johannes Schindelin1-18/+30