summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-03-08Merge branch 'gb/maint-submodule-env' into maintLibravatar Junio C Hamano8-33/+69
2010-03-08Merge branch 'as/maint-expire' into maintLibravatar Junio C Hamano4-18/+86
2010-03-08Merge branch 'ml/maint-grep-doc' into maintLibravatar Junio C Hamano1-13/+17
2010-03-08Merge branch 'jk/maint-push-tracking-wo-remote' into maintLibravatar Junio C Hamano1-1/+1
2010-03-08Merge branch 'jc/fetch-param' into maintLibravatar Junio C Hamano2-33/+88
2010-03-08Merge branch 'ne/pack-local-doc' into maintLibravatar Junio C Hamano1-8/+7
2010-03-08Merge branch 'jk/maint-add--interactive-delete' into maintLibravatar Junio C Hamano2-1/+31
2010-03-08Merge branch 'mm/mkstemps-mode-for-packfiles' into maintLibravatar Junio C Hamano8-93/+172
2010-03-08Merge branch 'jc/maint-fix-mailinfo-strip' into maintLibravatar Junio C Hamano2-3/+2
2010-03-08Merge branch 'jc/grep-author-all-match-implicit' into maintLibravatar Junio C Hamano6-10/+57
2010-03-08Merge branch 'jc/checkout-detached' into maintLibravatar Junio C Hamano5-12/+46
2010-03-08Merge branch 'maint-1.6.6' into maintLibravatar Junio C Hamano0-0/+0
2010-03-08grep: Colorize selected, context, and function linesLibravatar Mark Lodato4-2/+27
2010-03-08grep: Colorize filename, line number, and separatorLibravatar Mark Lodato4-34/+78
2010-03-07Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6Libravatar Junio C Hamano2-0/+4
2010-03-07Merge branch 'sp/maint-push-sideband' into maint-1.6.6Libravatar Junio C Hamano10-133/+371
2010-03-07Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6Libravatar Junio C Hamano1-1/+39
2010-03-07Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6Libravatar Junio C Hamano1-1/+1
2010-03-07Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6Libravatar Junio C Hamano2-1/+9
2010-03-07Merge branch 'rs/optim-text-wrap' into maint-1.6.6Libravatar Junio C Hamano3-37/+42
2010-03-07Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6Libravatar Junio C Hamano1-0/+3
2010-03-07Merge branch 'cc/maint-bisect-paths' into maint-1.6.6Libravatar Junio C Hamano2-0/+11
2010-03-07Merge branch 'mw/maint-gcc-warns-unused-write'Libravatar Junio C Hamano1-4/+6
2010-03-07Merge branch 'as/maint-expire'Libravatar Junio C Hamano4-18/+86
2010-03-07Merge branch 'ml/maint-grep-doc'Libravatar Junio C Hamano1-13/+17
2010-03-07Merge branch 'fn/maint-mkdtemp-compat'Libravatar Junio C Hamano1-1/+1
2010-03-07Merge branch 'gb/maint-submodule-env'Libravatar Junio C Hamano8-33/+69
2010-03-07Merge branch 'ne/pack-local-doc'Libravatar Junio C Hamano1-8/+7
2010-03-07Merge branch 'mb/shortlog-nongit-stdin'Libravatar Junio C Hamano1-0/+2
2010-03-07Merge branch 'jk/maint-push-tracking-wo-remote'Libravatar Junio C Hamano1-1/+1
2010-03-07Merge branch 'jc/fetch-param'Libravatar Junio C Hamano2-33/+88
2010-03-07Merge branch 'il/loosen-remote-helper-names'Libravatar Junio C Hamano1-2/+17
2010-03-07Merge branch 'nd/root-git'Libravatar Junio C Hamano10-18/+329
2010-03-07Merge branch 'js/runtime-prefix-trace-not-warn'Libravatar Junio C Hamano1-1/+1
2010-03-07Merge branch 'mm/mkstemps-mode-for-packfiles'Libravatar Junio C Hamano8-93/+172
2010-03-07Merge branch 'jk/maint-add--interactive-delete'Libravatar Junio C Hamano2-1/+31
2010-03-07Merge branch 'jc/maint-fix-mailinfo-strip'Libravatar Junio C Hamano2-3/+2
2010-03-07color: allow multiple attributesLibravatar Junio C Hamano3-14/+41
2010-03-07Sync with 1.7.0.2Libravatar Junio C Hamano4-8/+5
2010-03-07Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*Libravatar Mark Lodato3-7/+18
2010-03-07Git 1.7.0.2Libravatar Junio C Hamano3-8/+3
2010-03-07unset GREP_OPTIONS in test-lib.shLibravatar Bert Wesarg1-0/+2
2010-03-07Merge branch 'maint'Libravatar Junio C Hamano2-8/+17
2010-03-06t3417: Add test cases for "rebase --whitespace=fix"Libravatar Björn Gustavsson1-0/+126
2010-03-06t4124: Add additional tests of --whitespace=fixLibravatar Björn Gustavsson1-0/+170
2010-03-06apply: Allow blank context lines to match beyond EOFLibravatar Björn Gustavsson1-30/+138
2010-03-06apply: Remove the quick rejection testLibravatar Björn Gustavsson2-5/+16
2010-03-06apply: Don't unnecessarily update line lengths in the preimageLibravatar Björn Gustavsson1-11/+6
2010-03-06reset: disallow using --keep when there are unmerged entriesLibravatar Christian Couder4-22/+28
2010-03-06reset: disallow "reset --keep" outside a work treeLibravatar Christian Couder2-9/+18