summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
AgeCommit message (Expand)Author
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast
2009-05-25parse-opts: add OPT_FILENAME and transition builtinsStephen Boyd
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd
2009-05-25Merge branch 'master' into sb/opt-filenameJunio C Hamano
2009-05-23apply, fmt-merge-msg: use relative filenamesStephen Boyd
2009-03-08Move local variables to narrower scopesBenjamin Kramer
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-10-03parse-opt: migrate fmt-merge-msg.Pierre Habouzit
2008-07-17Merge branch 'sb/dashless'Junio C Hamano
2008-07-13Make usage strings dash-lessStephan Beyer
2008-07-01git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin
2008-05-09Merge branch 'sg/merge-options' (early part)Junio C Hamano
2008-04-16Merge branch 'maint-1.5.4' into maintJunio C Hamano
2008-04-16Ignore leading empty lines while summarizing mergesLinus Torvalds
2008-04-13fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor
2008-02-18check return code of prepare_revision_walkMartin Koegler
2007-11-14Fix parent rewriting in --early-outputLinus Torvalds
2007-09-19Use xmemdupz() in many places.Pierre Habouzit
2007-06-07War on whitespaceJunio C Hamano
2007-02-28Merge branch 'maint'Junio C Hamano
2007-02-28builtin-fmt-merge-msg: fix bugs in --file optionMichael Coleman
2007-02-21Mechanical conversion to use prefixcmp()Junio C Hamano
2006-11-17"git fmt-merge-msg" SIGSEGVLinus Torvalds
2006-09-21Tell between packed, unpacked and symbolic refs.Junio C Hamano
2006-09-18Make ref resolution sanerLinus Torvalds
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce
2006-09-01fmt-merge-msg: fix off-by-one bugJohannes Schindelin
2006-08-31Use xmalloc instead of mallocJonas Fonseca
2006-08-28free(NULL) is perfectly valid.Junio C Hamano
2006-08-27Use xrealloc instead of reallocJonas Fonseca
2006-08-16remove unnecessary initializationsDavid Rientjes
2006-08-03use declarations from builtin.h for builtin commandsMatthias Kestenholz
2006-07-29Call setup_git_directory() much earlierLinus Torvalds
2006-07-29Call setup_git_directory() earlyLinus Torvalds
2006-07-13Remove TYPE_* constant macros and use object_type enums consistently.Linus Torvalds
2006-07-13fmt-merge-msg fixJunio C Hamano
2006-07-04Make git-fmt-merge-msg a builtinJohannes Schindelin