summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-02-28git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`Libravatar Stefan-W. Hahn1-0/+96
2010-02-28git-am: Add am.keepcr and --no-keep-cr to override itLibravatar Stefan-W. Hahn3-7/+26
2010-02-28git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitLibravatar Stefan-W. Hahn2-8/+21
2010-02-28documentation: 'git-mailsplit --keep-cr' is not hidden anymoreLibravatar Stefan-W. Hahn2-2/+5
2010-02-25Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2010-02-25Merge branch 'maint-1.6.6' into maintLibravatar Junio C Hamano1-0/+1
2010-02-25Windows: redirect f[re]open("/dev/null") to f[re]open("nul")Libravatar Johannes Sixt4-0/+33
2010-02-25t3301-notes: insert a shbang line in ./fake_editor.shLibravatar Johannes Sixt1-0/+1
2010-02-24Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-02-24commit: quote the user name in the exampleLibravatar Matt Kraai1-1/+1
2010-02-24Merge branch 'ml/maint-grep-doc' into maintLibravatar Junio C Hamano1-5/+12
2010-02-23Merge branch 'maint'Libravatar Junio C Hamano3-6/+9
2010-02-23am: remove rebase-apply directory before gcLibravatar Jonathan Nieder1-2/+1
2010-02-23rerere: fix memory leak if rerere images can't be readLibravatar Bert Wesarg1-3/+6
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverLibravatar Bert Wesarg1-1/+2
2010-02-21Merge branch 'ml/maint-grep-doc'Libravatar Junio C Hamano1-5/+12
2010-02-21Merge branch 'tc/maint-transport-ls-remote-with-void'Libravatar Junio C Hamano2-1/+10
2010-02-21Merge branch 'hm/maint-imap-send-crlf'Libravatar Junio C Hamano1-1/+39
2010-02-21Merge branch 'sp/push-sideband'Libravatar Junio C Hamano10-134/+370
2010-02-21Merge branch 'jc/checkout-detached'Libravatar Junio C Hamano5-12/+46
2010-02-21Merge branch 'jc/maint-fix-test-perm'Libravatar Junio C Hamano2-0/+4
2010-02-21Merge branch 'jn/makefile-script-lib'Libravatar Junio C Hamano3-14/+28
2010-02-21Merge branch 'mv/request-pull-modernize'Libravatar Junio C Hamano1-4/+4
2010-02-20Merge branch 'maint'Libravatar Junio C Hamano3-14/+13
2010-02-20git-p4: fix bug in symlink handlingLibravatar Evan Powers1-3/+2
2010-02-19t1450: fix testcases that were wrongly expecting failureLibravatar Thomas Rast1-8/+8
2010-02-19Documentation: Fix indentation problem in git-commit(1)Libravatar Jacob Helwig1-3/+3
2010-02-19Merge branch 'maint'Libravatar Junio C Hamano7-29/+45
2010-02-19Merge branch 'jk/maint-rmdir-fix' into maintLibravatar Junio C Hamano2-1/+9
2010-02-18rm: fix bug in recursive subdirectory removalLibravatar Jeff King2-1/+9
2010-02-18Documentation: describe --thin more accuratelyLibravatar Stephen Boyd5-28/+36
2010-02-17Merge branch 'maint'Libravatar Junio C Hamano10-36/+39
2010-02-17docs: don't talk about $GIT_DIR/refs/ everywhereLibravatar Jeff King10-36/+39
2010-02-17Merge branch 'np/fast-import-idx-v2'Libravatar Junio C Hamano2-95/+84
2010-02-17Update draft release notes to 1.7.1Libravatar Junio C Hamano1-1/+4
2010-02-17Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-02-17Update 1.7.0.1 release notesLibravatar Junio C Hamano1-1/+1
2010-02-17Merge branch 'jk/cherry-pick-reword' into maintLibravatar Junio C Hamano1-23/+19
2010-02-17Merge branch 'jk/grep-double-dash' into maintLibravatar Junio C Hamano2-0/+43
2010-02-17Merge branch 'jc/typo' into maintLibravatar Junio C Hamano17-19/+20
2010-02-17gitweb: Protect escaping functions against calling on undefLibravatar Jakub Narebski1-1/+8
2010-02-17gitweb: esc_html (short) error message in die_errorLibravatar Jakub Narebski1-2/+2
2010-02-17fast-import: use the diff_delta() max_delta_size argumentLibravatar Nicolas Pitre1-6/+2
2010-02-17fast-import: honor pack.indexversion and pack.packsizelimit config varsLibravatar Nicolas Pitre1-0/+11
2010-02-17fast-import: make default pack size unlimitedLibravatar Nicolas Pitre2-10/+7
2010-02-17fast-import: use write_idx_file() instead of custom codeLibravatar Nicolas Pitre1-46/+17
2010-02-17fast-import: use sha1write() for pack dataLibravatar Nicolas Pitre1-10/+25
2010-02-17fast-import: start using struct pack_idx_entryLibravatar Nicolas Pitre1-29/+28
2010-02-16grep documentation: clarify what files matchLibravatar Mark Lodato1-5/+12
2010-02-16Merge branch 'jc/typo'Libravatar Junio C Hamano17-19/+20