aboutsummaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
Commit message (Expand)AuthorAge
* Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-29
|\
| * apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-23
* | Move local variables to narrower scopesBenjamin Kramer2009-03-07
|/
* Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* parse-opt: migrate fmt-merge-msg.Pierre Habouzit2008-10-02
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16
|\
| * Make usage strings dash-lessStephan Beyer2008-07-13
* | git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna2008-06-30
|/
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* Merge branch 'sg/merge-options' (early part)Junio C Hamano2008-05-08
|\
| * fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-12
* | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-16
|\ \ | |/ |/|
| * Ignore leading empty lines while summarizing mergesLinus Torvalds2008-04-15
* | check return code of prepare_revision_walkMartin Koegler2008-02-17
|/
* Fix parent rewriting in --early-outputLinus Torvalds2007-11-14
* Use xmemdupz() in many places.Pierre Habouzit2007-09-18
* War on whitespaceJunio C Hamano2007-06-07
* Merge branch 'maint'Junio C Hamano2007-02-27
|\
| * builtin-fmt-merge-msg: fix bugs in --file optionMichael Coleman2007-02-27
* | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-20
|/
* "git fmt-merge-msg" SIGSEGVLinus Torvalds2006-11-16
* Tell between packed, unpacked and symbolic refs.Junio C Hamano2006-09-20
* Make ref resolution sanerLinus Torvalds2006-09-17
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* fmt-merge-msg: fix off-by-one bugJohannes Schindelin2006-09-01
* Use xmalloc instead of mallocJonas Fonseca2006-08-31
* free(NULL) is perfectly valid.Junio C Hamano2006-08-27
* Use xrealloc instead of reallocJonas Fonseca2006-08-26
* remove unnecessary initializationsDavid Rientjes2006-08-15
* use declarations from builtin.h for builtin commandsMatthias Kestenholz2006-08-02
* Call setup_git_directory() much earlierLinus Torvalds2006-07-29
* Call setup_git_directory() earlyLinus Torvalds2006-07-28
* Remove TYPE_* constant macros and use object_type enums consistently.Linus Torvalds2006-07-12
* fmt-merge-msg fixJunio C Hamano2006-07-12
* Make git-fmt-merge-msg a builtinJohannes Schindelin2006-07-03