summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
Commit message (Expand)AuthorAgeFilesLines
* Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-271-2/+1
* parse-opts: add OPT_FILENAME and transition builtinsStephen Boyd2009-05-251-2/+1
* parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-1/+2
* Merge branch 'master' into sb/opt-filenameJunio C Hamano2009-05-251-4/+2
|\
| * Move local variables to narrower scopesBenjamin Kramer2009-03-071-4/+2
* | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-231-0/+1
|/
* Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-3/+1
* parse-opt: migrate fmt-merge-msg.Pierre Habouzit2008-10-021-28/+21
* Merge branch 'sb/dashless'Junio C Hamano2008-07-161-1/+1
|\
| * Make usage strings dash-lessStephan Beyer2008-07-131-1/+1
* | git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna2008-06-301-66/+89
|/
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-2/+2
* Merge branch 'sg/merge-options' (early part)Junio C Hamano2008-05-081-4/+10
|\
| * fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-121-4/+10
* | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-161-1/+9
|\ \ | |/ |/|
| * Ignore leading empty lines while summarizing mergesLinus Torvalds2008-04-151-1/+9
* | check return code of prepare_revision_walkMartin Koegler2008-02-171-1/+2
|/
* Fix parent rewriting in --early-outputLinus Torvalds2007-11-141-1/+1
* Use xmemdupz() in many places.Pierre Habouzit2007-09-181-11/+6
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* Merge branch 'maint'Junio C Hamano2007-02-271-1/+3
|\
| * builtin-fmt-merge-msg: fix bugs in --file optionMichael Coleman2007-02-271-1/+3
* | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-201-5/+5
|/
* "git fmt-merge-msg" SIGSEGVLinus Torvalds2006-11-161-0/+2
* Tell between packed, unpacked and symbolic refs.Junio C Hamano2006-09-201-1/+1
* Make ref resolution sanerLinus Torvalds2006-09-171-5/+2
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-11/+11
* fmt-merge-msg: fix off-by-one bugJohannes Schindelin2006-09-011-1/+1
* Use xmalloc instead of mallocJonas Fonseca2006-08-311-3/+3
* free(NULL) is perfectly valid.Junio C Hamano2006-08-271-2/+1
* Use xrealloc instead of reallocJonas Fonseca2006-08-261-2/+2
* remove unnecessary initializationsDavid Rientjes2006-08-151-1/+1
* use declarations from builtin.h for builtin commandsMatthias Kestenholz2006-08-021-1/+2
* Call setup_git_directory() much earlierLinus Torvalds2006-07-291-2/+1
* Call setup_git_directory() earlyLinus Torvalds2006-07-281-1/+2
* Remove TYPE_* constant macros and use object_type enums consistently.Linus Torvalds2006-07-121-1/+1
* fmt-merge-msg fixJunio C Hamano2006-07-121-6/+10
* Make git-fmt-merge-msg a builtinJohannes Schindelin2006-07-031-0/+355
View Lorry Controller Status