summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-12-03Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
2009-12-03Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeLibravatar Junio C Hamano1-0/+4
2009-12-02Git 1.6.6-rc1Libravatar Junio C Hamano2-2/+2
2009-12-02git-pull.sh: Fix call to git-merge for new command formatLibravatar Horst H. von Brand1-3/+3
2009-12-02Merge branch 'maint'Libravatar Junio C Hamano3-12/+43
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-01Update draft release notes to 1.6.6 before -rc1Libravatar Junio C Hamano1-20/+67
2009-12-01Merge branch 'maint'Libravatar Junio C Hamano4-6/+6
2009-12-01Merge branch 'jc/deprecate-old-syntax-from-merge'Libravatar Junio C Hamano1-0/+6
2009-12-01git-merge: a deprecation notice of the ancient command line syntaxLibravatar Junio C Hamano1-0/+6
2009-12-01Merge branch 'bw/remote-get-ref-states-fix'Libravatar Junio C Hamano1-2/+4
2009-12-01get_ref_states: strdup entries and free util in stale listLibravatar Bert Wesarg1-2/+4
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-12-01Merge branch 'jn/gitweb-blame'Libravatar Junio C Hamano6-88/+1173
2009-12-01gitweb: Add link to other blame implementation in blame viewsLibravatar Jakub Narebski1-0/+11
2009-11-30gitweb: Make linking to actions requiring JavaScript a featureLibravatar Jakub Narebski1-1/+8
2009-11-30Merge branch 'fc/maint-format-patch-pathspec-dashes'Libravatar Junio C Hamano2-1/+7
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Libravatar Junio C Hamano3-18/+27
2009-11-30Merge branch 'ap/maint-merge-strategy-list-fix'Libravatar Junio C Hamano1-1/+1
2009-11-30Merge branch 'jc/pretty-lf'Libravatar Junio C Hamano3-2/+70
2009-11-30Merge branch 'cc/bisect-doc'Libravatar Junio C Hamano3-0/+1364
2009-11-30Merge branch 'em/commit-claim'Libravatar Junio C Hamano3-4/+129
2009-11-30Merge branch 'jc/mailinfo-remove-brackets'Libravatar Junio C Hamano2-21/+35
2009-11-30Merge branch 'fc/send-email-envelope'Libravatar Junio C Hamano3-4/+41
2009-11-30Merge branch 'uk/maint-shortlog-encoding'Libravatar Junio C Hamano2-8/+39
2009-11-30Merge branch 'ns/send-email-no-chain-reply-to'Libravatar Junio C Hamano2-2/+66
2009-11-30Merge branch 'jc/maint-am-keep'Libravatar Junio C Hamano1-5/+6
2009-11-30Merge branch 'bw/diff-color-hunk-header'Libravatar Junio C Hamano5-19/+63
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-29t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATHLibravatar Matthew Ogilvie1-0/+13
2009-11-29t3409 t4107 t7406 t9150: use dashless commandsLibravatar Matthew Ogilvie4-16/+16
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Libravatar Avery Pennarun1-1/+1
2009-11-29t2300: use documented technique to invoke git-sh-setupLibravatar Matthew Ogilvie1-1/+1
2009-11-29prepare send-email for smoother change of --chain-reply-to defaultLibravatar Nanako Shiraishi2-2/+66
2009-11-28Update draft release notes to 1.6.6 before merging topics for -rc1Libravatar Junio C Hamano1-33/+100
2009-11-28Makefile: do not clean arm directoryLibravatar Jonathan Nieder1-1/+1
2009-11-28Give the hunk comment its own colorLibravatar Bert Wesarg5-9/+52
2009-11-27send-email: automatic envelope senderLibravatar Felipe Contreras3-4/+24
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineLibravatar Junio C Hamano2-10/+11
2009-11-27Remove dead code from "git am"Libravatar Junio C Hamano1-5/+6
2009-11-27Merge branch 'maint'Libravatar Junio C Hamano2-2/+20
2009-11-27Add a notice that only certain functions can print color escape codesLibravatar Johannes Sixt1-0/+5
2009-11-26format-patch: add test for parsing of "--"Libravatar Felipe Contreras1-0/+5
2009-11-26format-patch: fix parsing of "--" on the command lineLibravatar Felipe Contreras1-1/+2
2009-11-26builtin-apply.c: pay attention to -p<n> when determining the nameLibravatar Junio C Hamano2-2/+20