summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test: errors preparing for a test are not specialjn/test-cleanup-7006Jonathan Nieder2011-12-141-56/+17
* support pager.* for external commandsJeff King2011-08-192-0/+38
* want_color: automatically fallback to color.uiJeff King2011-08-199-44/+6
* diff: don't load color config in plumbingJeff King2011-08-193-3/+16
* config: refactor get_colorbool functionJeff King2011-08-191-2/+3
* color: delay auto-color decision until point of useJeff King2011-08-1911-19/+59
* git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-189-29/+27
* diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-187-34/+29
* setup_pager: set GIT_PAGER_IN_USEJeff King2011-08-182-7/+12
* t7006: use test_config helpersJeff King2011-08-181-21/+18
* test-lib: add helper functions for configJeff King2011-08-181-0/+18
* t7006: modernize calls to unsetJeff King2011-08-181-2/+2
* checkout-index: remove obsolete commentNguyễn Thái Ngọc Duy2011-08-171-32/+0
* Prepare for 1.7.6.1Junio C Hamano2011-08-162-1/+53
* Merge branch 'jk/tag-list-multiple-patterns' into maintJunio C Hamano2011-08-163-12/+28
|\
| * tag: accept multiple patterns for --listJeff King2011-06-203-12/+28
* | Merge branch 'jl/submodule-update-quiet' into maintJunio C Hamano2011-08-162-4/+11
|\ \
| * | submodule: update and add must honor --quiet flagJens Lehmann2011-07-282-4/+11
* | | Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintJunio C Hamano2011-08-163-11/+15
|\ \ \
| * | | submodule add: clean up duplicated codeJens Lehmann2011-06-061-9/+1
| * | | submodule add: allow relative repository path even when no url is setJens Lehmann2011-06-063-4/+9
| * | | submodule add: test failure when url is not configured in superprojectJens Lehmann2011-06-061-0/+7
* | | | Merge branch 'oa/pull-reflog' into maintJunio C Hamano2011-08-161-1/+1
|\ \ \ \
| * | | | pull: remove extra space from reflog messageOri Avtalion2011-08-011-1/+1
* | | | | Merge branch 'js/ls-tree-error' into maintJunio C Hamano2011-08-162-3/+25
|\ \ \ \ \
| * | | | | Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.Jon Seymour2011-07-252-4/+2
| * | | | | Add a test to check that git ls-tree sets non-zero exit code on error.Jon Seymour2011-07-241-0/+24
* | | | | | Merge branch 'jk/fast-export-quote-path' into maintJunio C Hamano2011-08-162-8/+51
|\ \ \ \ \ \
| * | | | | | fast-export: quote paths in outputJeff King2011-08-052-8/+51
* | | | | | | Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano2011-08-161-2/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'v1.7.6' into jc/checkout-reflog-fixJunio C Hamano2011-07-061277-27194/+94555
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge commit 'v1.7.0' into jc/checkout-reflog-fixJunio C Hamano2011-07-061295-32474/+132143
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'v1.6.0' into jc/checkout-reflog-fixJunio C Hamano2011-07-06926-20440/+66638
| |\ \ \ \ \ \ \ \
| * | | | | | | | | checkout: do not write bogus reflog entry outJunio C Hamano2011-07-061-3/+5
* | | | | | | | | | Merge branch 'jc/maint-reset-unmerged-path' into maintJunio C Hamano2011-08-163-2/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano2011-07-133-2/+18
* | | | | | | | | | | Merge branch 'mz/doc-rebase-abort' into maintJunio C Hamano2011-08-162-7/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase: clarify "restore the original branch"Martin von Zweigbergk2011-07-132-7/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bw/log-all-ref-updates-doc' into maintJunio C Hamano2011-08-162-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: clearly specify what refs are honored by core.logAllRefUpdatesBert Wesarg2011-07-122-3/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/maint-add-path-stat-pwd' into maintJunio C Hamano2011-08-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | get_pwd_cwd(): Do not trust st_dev/st_ino blindlyJohannes Schindelin2011-07-111-1/+2
* | | | | | | | | | | | Merge branch 'ms/help-unknown' into maintJunio C Hamano2011-08-161-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | help_unknown_cmd: do not propose an "unknown" cmdMichael Schubert2011-07-081-0/+12
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mz/doc-synopsis-verse' into maintJunio C Hamano2011-08-1693-6/+92
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-0693-6/+92
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jn/mime-type-with-params' into maintJunio C Hamano2011-08-161-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xssJakub Narebski2011-06-301-1/+2
| * | | | | | | | | | | | gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xssJakub Narebski2011-06-301-1/+9
* | | | | | | | | | | | | Merge branch 'jc/submodule-sync-no-auto-vivify' into maintJunio C Hamano2011-08-163-30/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \