summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-03-24fmt-merge-msg: hide summary optionLibravatar Stephen Boyd1-1/+3
2010-03-24fmt-merge-msg: remove custom string_list implementationLibravatar Stephen Boyd1-83/+44
2010-03-24string-list: add unsorted_string_list_lookup()Libravatar Stephen Boyd3-5/+17
2010-03-24fmt-merge-msg: use pretty.c routinesLibravatar Stephen Boyd1-21/+8
2010-03-24t6200: test fmt-merge-msg moreLibravatar Stephen Boyd1-0/+115
2010-03-24t6200: modernize with test_tickLibravatar Stephen Boyd1-35/+29
2010-03-24fmt-merge-msg: be quiet if nothing to mergeLibravatar Stephen Boyd2-0/+22
2010-03-24diff --check: honor conflict-marker-size attributeLibravatar Junio C Hamano2-14/+33
2010-03-24Merge branch 'jh/maint-submodule-status-in-void'Libravatar Junio C Hamano1-1/+3
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano25-33/+1366
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Libravatar Junio C Hamano10-43/+221
2010-03-24Merge branch 'pb/log-first-parent-p-m'Libravatar Junio C Hamano17-30/+653
2010-03-24Merge branch 'jc/maint-refs-dangling'Libravatar Junio C Hamano2-7/+10
2010-03-24Merge branch 'maint'Libravatar Junio C Hamano1-0/+3
2010-03-24Merge branch 'jc/color-attrs' into maintLibravatar Junio C Hamano3-14/+41
2010-03-24Merge branch 'jk/maint-add-ignored-dir' into maintLibravatar Junio C Hamano3-4/+103
2010-03-24Merge branch 'bg/apply-fix-blank-at-eof' into maintLibravatar Junio C Hamano4-40/+450
2010-03-24Teach rebase the --no-ff option.Libravatar Marc Branchaud5-10/+152
2010-03-24http-backend: Don't infinite loop during die()Libravatar Shawn O. Pearce1-7/+11
2010-03-24Correct references to /usr/bin/python which does not exist on FreeBSDLibravatar R. Tyler Ballance5-4/+9
2010-03-24Documentation: explain the meaning of "-g" in git-describe outputLibravatar Markus Heidelberg1-0/+3
2010-03-24rev-list: use default abbrev length when abbrev-commit is in effectLibravatar Michael J Gruber1-1/+1
2010-03-24imap-send: Remove limitation on message bodyLibravatar Ramkumar Ramachandra2-8/+10
2010-03-21Sync with Git 1.7.0.3Libravatar Junio C Hamano9-25/+13
2010-03-21Git 1.7.0.3Libravatar Junio C Hamano3-10/+5
2010-03-21Merge branch 'maint-1.6.6' into maintLibravatar Junio C Hamano4-14/+6
2010-03-21.mailmap: Map the the first submissions of MJG by e-mailLibravatar Michael J Gruber1-0/+1
2010-03-21ls: remove redundant logicLibravatar Erik Faye-Lund2-9/+4
2010-03-21cherry: support --abbrev optionLibravatar Erik Faye-Lund1-18/+21
2010-03-21Documentation/git-clone: Transform description list into item listLibravatar Michael J Gruber1-5/+5
2010-03-21Documentation/urls: Remove spurious example markersLibravatar Michael J Gruber1-6/+0
2010-03-21Documentation/gitdiffcore: Remove misleading date in headingLibravatar Michael J Gruber1-1/+1
2010-03-21Documentation/git-reflog: Fix formatting of command listsLibravatar Michael J Gruber1-2/+0
2010-03-21rev-list: fix --pretty=oneline with empty messageLibravatar Erik Faye-Lund2-1/+13
2010-03-20merge-recursive: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder2-3/+6
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder2-41/+64
2010-03-20compat: add mempcpy()Libravatar Jonathan Nieder1-0/+9
2010-03-20checkout -m --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder2-1/+2
2010-03-20merge_trees(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder2-3/+9
2010-03-20merge_file(): add comment explaining behavior wrt conflict styleLibravatar Jonathan Nieder1-0/+6
2010-03-20checkout --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder2-3/+3
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder6-15/+17
2010-03-20merge-file --diff3: add a label for ancestorLibravatar Jonathan Nieder2-2/+3
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder4-13/+20
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputLibravatar Jonathan Nieder2-2/+15
2010-03-20tests: document cherry-pick behavior in face of conflictsLibravatar Jonathan Nieder1-0/+198
2010-03-20tests: document format of conflicts from checkout -mLibravatar Jonathan Nieder1-4/+61
2010-03-20.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaLibravatar Michael J Gruber1-0/+3
2010-03-20revert: fix tiny memory leak in cherry-pick --ffLibravatar Jonathan Nieder1-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 12:49:53 +0000