summaryrefslogtreecommitdiffstats
path: root/builtin/fmt-merge-msg.c (unfollow)
Commit message (Expand)AuthorFilesLines
2010-04-09diff.c: work around pointer constness warningsJunio C Hamano1-2/+2
2010-04-08docs: clarify "branch -l"Jeff King1-0/+2
2010-04-07fix typos and grammar in 1.7.1 draft release notesJeff King1-10/+10
2010-04-07notes.h: declare bit field as unsigned to silence compiler complaintsBrandon Casey1-1/+1
2010-04-07Git 1.7.1-rc0v1.7.1-rc0Junio C Hamano1-1/+15
2010-04-05Revert "Link against libiconv on IRIX"Junio C Hamano1-2/+0
2010-04-04pack-protocol.txt: fix pkt-line lengthsTay Ray Chuan1-4/+4
2010-04-04pack-protocol.txt: fix spellingTay Ray Chuan1-1/+1
2010-04-04Teach mailinfo %< as an alternative scissors markJonathan Nieder1-1/+2
2010-04-03Makefile: future-proof Cygwin version checkJonathan Nieder1-1/+1
2010-04-03Fix _XOPEN_SOURCE problem on DragonFlyYONETANI Tomokazu1-1/+2
2010-04-02builtin/commit: remove unnecessary variable definitionMarkus Heidelberg1-1/+1
2010-04-02builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg1-2/+2
2010-04-02Integrate version 3 ciabot scripts into contrib/.Eric Raymond3-0/+426
2010-04-02fix textconv leak in emit_rewrite_diffJeff King1-0/+4
2010-04-02fix const-correctness of write_sha1_fileJeff King2-4/+4
2010-04-02Makefile: update defaults for modern CygwinEric Blake1-10/+12
2010-04-01Git 1.7.0.4v1.7.0.4Junio C Hamano3-4/+13
2010-03-31Documentation: show-ref <pattern>s are optionalHolger Weiß1-1/+1
2010-03-31Link against libiconv on IRIXHolger Weiß1-0/+2
2010-03-31Don't redefine htonl and ntohl on big-endianHolger Weiß1-0/+2
2010-03-31gitweb: git_get_project_config requires only $git_dir, not also $projectJakub Narebski1-2/+1
2010-03-31Updated the usage string of git resetJan Stępień1-1/+2
2010-03-31Documentation: Clarify support for smart HTTP backendGreg Bacon1-1/+1
2010-03-31Windows: fix utime() for read-only filesJohannes Sixt1-2/+18
2010-03-30diff: fix textconv error zombiesJohannes Sixt1-6/+11
2010-03-30format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2-1/+12
2010-03-30refs.c: Write reflogs for notes just like for branch headsMichael J Gruber2-1/+2
2010-03-30t3301-notes: Test the creation of reflog entriesMichael J Gruber1-0/+9
2010-03-29RPM spec: include bash completion supportIan Ward Comfort1-0/+7
2010-03-29Update draft release notes to 1.7.1Junio C Hamano1-9/+10
2010-03-29Makefile: Remove usage of deprecated Python "has_key" methodDavid Aguilar1-3/+2
2010-03-29rebase -i: make post-rewrite work for 'edit'Thomas Rast2-2/+19
2010-03-29Prepare for 1.7.0.4Junio C Hamano2-1/+20
2010-03-29t9350: fix careless use of "cd"Junio C Hamano1-33/+38
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2-5/+16
2010-03-28fast-export: don't segfault when marks file cannot be openedSverre Rabbelier1-1/+1
2010-03-28imap-send: suppress warning about cleartext password with CRAM-MD5Chris Webb1-3/+3
2010-03-25send-email: lazily assign editor variableMichael J Gruber1-1/+4
2010-03-25fmt-merge-msg: hide summary optionStephen Boyd1-1/+3
2010-03-25fmt-merge-msg: remove custom string_list implementationStephen Boyd1-83/+44
2010-03-25string-list: add unsorted_string_list_lookup()Stephen Boyd3-5/+17
2010-03-25fmt-merge-msg: use pretty.c routinesStephen Boyd1-21/+8
2010-03-25t6200: test fmt-merge-msg moreStephen Boyd1-0/+115
2010-03-25t6200: modernize with test_tickStephen Boyd1-35/+29
2010-03-25fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2-0/+22
2010-03-25diff --check: honor conflict-marker-size attributeJunio C Hamano2-14/+33
2010-03-24Teach rebase the --no-ff option.Marc Branchaud5-10/+152
2010-03-24http-backend: Don't infinite loop during die()Shawn O. Pearce1-7/+11
2010-03-24Correct references to /usr/bin/python which does not exist on FreeBSDR. Tyler Ballance5-4/+9