summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-12-13octopus: reenable fast-forward mergesLibravatar Stephen Boyd2-1/+19
2009-12-13octopus: make merge process simpler to followLibravatar Stephen Boyd2-4/+38
2009-12-10Git 1.6.5.6Libravatar Junio C Hamano4-3/+27
2009-12-10Fix archive format with -- on the command lineLibravatar Junio C Hamano1-6/+10
2009-12-10Remove post-upload-hookLibravatar Junio C Hamano4-172/+2
2009-12-08Merge branch 'mm/maint-merge-ff-error-message-fix' into maintLibravatar Junio C Hamano3-18/+27
2009-12-08Merge branch 'jn/maint-pull-rebase-error-message' into maintLibravatar Junio C Hamano1-15/+33
2009-12-08Merge branch 'jk/maint-add-p-delete-fix' into maintLibravatar Junio C Hamano2-1/+25
2009-12-07add-interactive: fix deletion of non-empty filesLibravatar Jeff King2-1/+25
2009-12-05Git 1.6.5.5Libravatar Junio C Hamano4-5/+11
2009-12-05Fix diff -B/--dirstat miscounting of newly added contentsLibravatar Linus Torvalds1-1/+10
2009-12-05reset: improve worktree safety valvesLibravatar Jeff King2-5/+33
2009-12-05Documentation: Avoid use of xmlto --stringparamLibravatar Todd Zullinger3-11/+23
2009-12-04archive: clarify description of path parameterLibravatar René Scharfe1-2/+3
2009-12-04rerere: don't segfault on failure to open rr-cacheLibravatar Jeff King1-0/+2
2009-12-03Prepare for 1.6.5.5Libravatar Junio C Hamano1-0/+44
2009-12-03Merge branch 'uk/maint-shortlog-encoding' into maintLibravatar Junio C Hamano2-9/+39
2009-12-03Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintLibravatar Junio C Hamano2-1/+7
2009-12-03Merge branch 'ap/maint-merge-strategy-list-fix' into maintLibravatar Junio C Hamano1-1/+1
2009-12-03Merge branch 'jc/maint-am-keep' into maintLibravatar Junio C Hamano1-5/+6
2009-12-03Merge branch 'rs/work-around-grep-opt-insanity' into maintLibravatar Junio C Hamano9-25/+32
2009-12-03Merge branch 'rj/maint-cygwin-count-objects' into maintLibravatar Junio C Hamano1-0/+1
2009-12-03Merge branch 'mm/maint-hint-failed-merge' into maintLibravatar Junio C Hamano5-3/+32
2009-12-03Merge branch 'th/maint-remote-update-help-string' into maintLibravatar Junio C Hamano1-1/+1
2009-12-03Merge branch 'rj/maint-t9700' into maintLibravatar Junio C Hamano1-1/+1
2009-12-03Merge branch 'ls/maint-mailinfo-no-inbody' into maintLibravatar Junio C Hamano16-5/+122
2009-12-03Merge branch 'mo/maint-crlf-doc' into maintLibravatar Junio C Hamano1-3/+4
2009-12-03Merge branch 'th/remote-usage' into maintLibravatar Junio C Hamano2-21/+52
2009-12-03Merge branch 'pb/maint-use-custom-perl' into maintLibravatar Junio C Hamano4-4/+5
2009-12-03Merge branch 'mm/config-pathname-tilde-expand' into maintLibravatar Junio C Hamano5-37/+69
2009-12-03Merge branch 'bc/grep-i-F' into maintLibravatar Junio C Hamano4-6/+27
2009-12-03Merge branch 'jk/maint-break-rename-reduce-memory' into maintLibravatar Junio C Hamano2-3/+10
2009-12-03Merge branch 'rj/maint-simplify-cygwin-makefile' into maintLibravatar Junio C Hamano1-4/+2
2009-12-03Merge branch 'rg/doc-workflow' into maintLibravatar Junio C Hamano1-0/+115
2009-12-03Merge branch 'np/maint-sideband-favor-status' into maintLibravatar Junio C Hamano2-23/+23
2009-12-03Documentation: xmlto 0.0.18 does not know --stringparamLibravatar Junio C Hamano1-0/+7
2009-12-03t4201: use ISO8859-1 rather than ISO-8859-1Libravatar Brandon Casey1-2/+2
2009-12-03pull: clarify advice for the unconfigured error caseLibravatar Jan Krüger1-15/+33
2009-12-03Git 1.6.5.4Libravatar Junio C Hamano2-2/+3
2009-12-03Unconditionally set man.base.url.for.relative.linksLibravatar Junio C Hamano1-2/+5
2009-12-03Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeLibravatar Junio C Hamano1-0/+4
2009-12-02Prepare for 1.6.5.4Libravatar Junio C Hamano2-1/+33
2009-12-02merge: do not add standard message when message is given with -m optionLibravatar Junio C Hamano2-11/+10
2009-12-02Do not misidentify "git merge foo HEAD" as an old-style invocationLibravatar Junio C Hamano1-1/+1
2009-12-01help: Do not unnecessarily look for a repositoryLibravatar David Aguilar1-3/+3
2009-12-01Documentation: Fix a few i.e./e.g. mix-upsLibravatar Michael J Gruber2-2/+2
2009-11-30Documentation: Document --branch option in git clone synopsisLibravatar David Soria Parra1-1/+1
2009-11-29builtin-merge: show user-friendly error messages for fast-forward too.Libravatar Matthieu Moy1-0/+1
2009-11-29merge-recursive: make the error-message generation an extern functionLibravatar Matthieu Moy2-13/+21
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Libravatar Avery Pennarun1-1/+1