summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-06Documentation: describe new cherry-pick --ff optionLibravatar Christian Couder1-1/+5
2010-03-06cherry-pick: add tests for new --ff optionLibravatar Christian Couder1-0/+98
2010-03-06revert: add --ff option to allow fast forward when cherry-pickingLibravatar Junio C Hamano1-3/+40
2010-03-06builtin/merge: make checkout_fast_forward() non staticLibravatar Junio C Hamano2-1/+4
2010-03-06parse-options: add parse_options_concat() to concat optionsLibravatar Junio C Hamano2-0/+16
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
2010-03-06Documentation: reset: describe new "--keep" optionLibravatar Christian Couder1-1/+48
2010-03-06stash: suggest the correct command line for unknown options.Libravatar Matthieu Moy1-0/+1
2010-03-06t7406: Fix submodule init config testsLibravatar Stephen Boyd1-8/+16
2010-03-06Add 'git format-patch --to=' option and 'format.to' configuration variable.Libravatar Steven Drake3-3/+38
2010-03-05git-svn: make git svn --version work againLibravatar Michael J Gruber1-0/+1
2010-03-05Revert "git-svn: always initialize with core.autocrlf=false"Libravatar Erik Faye-Lund1-1/+0
2010-03-05git-svn: support fetch with autocrlf onLibravatar Erik Faye-Lund1-1/+1
2010-03-05hash-object: support --stdin-paths with --no-filtersLibravatar Erik Faye-Lund3-9/+19
2010-03-04Merge branch 'maint'Libravatar Junio C Hamano2-2/+26
2010-03-04Update draft release notes to 1.7.0.2Libravatar Junio C Hamano1-1/+25
2010-03-04Merge branch 'jn/gitweb-config-error-die' into maintLibravatar Junio C Hamano1-3/+6
2010-03-04Merge branch 'jn/maint-fix-pager' into maintLibravatar Junio C Hamano10-15/+268