summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
AgeCommit message (Expand)AuthorFilesLines
2008-07-16Merge branch 'sb/dashless'Libravatar Junio C Hamano1-1/+1
2008-07-13Make usage strings dash-lessLibravatar Stephan Beyer1-1/+1
2008-06-30git-fmt-merge-msg: make it usable from other builtinsLibravatar Miklos Vajna1-66/+89
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-2/+2
2008-05-08Merge branch 'sg/merge-options' (early part)Libravatar Junio C Hamano1-4/+10
2008-04-16Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-1/+9
2008-04-15Ignore leading empty lines while summarizing mergesLibravatar Linus Torvalds1-1/+9
2008-04-12fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableLibravatar SZEDER Gábor1-4/+10
2008-02-17check return code of prepare_revision_walkLibravatar Martin Koegler1-1/+2
2007-11-14Fix parent rewriting in --early-outputLibravatar Linus Torvalds1-1/+1
2007-09-18Use xmemdupz() in many places.Libravatar Pierre Habouzit1-11/+6
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-02-27Merge branch 'maint'Libravatar Junio C Hamano1-1/+3
2007-02-27builtin-fmt-merge-msg: fix bugs in --file optionLibravatar Michael Coleman1-1/+3
2007-02-20Mechanical conversion to use prefixcmp()Libravatar Junio C Hamano1-5/+5
2006-11-16"git fmt-merge-msg" SIGSEGVLibravatar Linus Torvalds1-0/+2
2006-09-20Tell between packed, unpacked and symbolic refs.Libravatar Junio C Hamano1-1/+1
2006-09-17Make ref resolution sanerLibravatar Linus Torvalds1-5/+2
2006-09-02Replace uses of strdup with xstrdup.Libravatar Shawn Pearce1-11/+11
2006-09-01fmt-merge-msg: fix off-by-one bugLibravatar Johannes Schindelin1-1/+1
2006-08-31Use xmalloc instead of mallocLibravatar Jonas Fonseca1-3/+3
2006-08-27free(NULL) is perfectly valid.Libravatar Junio C Hamano1-2/+1
2006-08-26Use xrealloc instead of reallocLibravatar Jonas Fonseca1-2/+2
2006-08-15remove unnecessary initializationsLibravatar David Rientjes1-1/+1
2006-08-02use declarations from builtin.h for builtin commandsLibravatar Matthias Kestenholz1-1/+2
2006-07-29Call setup_git_directory() much earlierLibravatar Linus Torvalds1-2/+1
2006-07-28Call setup_git_directory() earlyLibravatar Linus Torvalds1-1/+2
2006-07-12Remove TYPE_* constant macros and use object_type enums consistently.Libravatar Linus Torvalds1-1/+1
2006-07-12fmt-merge-msg fixLibravatar Junio C Hamano1-6/+10
2006-07-03Make git-fmt-merge-msg a builtinLibravatar Johannes Schindelin1-0/+355
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 16:28:14 +0000