summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pager: disable colors for some known-bad configurationsjk/color-for-more-pagersJeff King2014-01-175-4/+50
* DONOTMERGE: needs matching change to git-sh-setupJunio C Hamano2014-01-170-0/+0
* setup_pager: set MORE=RJeff King2014-01-173-0/+12
* setup_pager: refactor LESS/LV environment settingJeff King2014-01-171-11/+9
* Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-135-3/+28
|\
| * pager: set LV=-c alongside LESS=FRSXJonathan Nieder2014-01-075-3/+28
* | Merge branch 'br/sha1-name-40-hex-no-disambiguation'Junio C Hamano2014-01-131-2/+2
|\ \
| * | sha1_name: don't resolve refs when core.warnambiguousrefs is falsebr/sha1-name-40-hex-no-disambiguationBrodie Rao2014-01-071-2/+2
| |/
* | Update draft release notes to 1.9Junio C Hamano2014-01-101-1/+114
* | Merge branch 'ss/builtin-cleanup'Junio C Hamano2014-01-104-125/+143
|\ \
| * | builtin/help.c: speed up is_git_command() by checking for builtin commands firstss/builtin-cleanupSebastian Schuberth2014-01-064-117/+134
| * | builtin/help.c: call load_command_list() only when it is neededSebastian Schuberth2014-01-061-1/+2
| * | git.c: consistently use the term "builtin" instead of "internal command"Sebastian Schuberth2014-01-062-8/+8
* | | Merge branch 'vm/octopus-merge-bases-simplify'Junio C Hamano2014-01-101-18/+18
|\ \ \
| * | | get_octopus_merge_bases(): cleanup redundant variablevm/octopus-merge-bases-simplifyVasily Makarov2014-01-031-18/+18
| |/ /
* | | Merge branch 'ta/format-user-manual-as-an-article'Junio C Hamano2014-01-102-2/+2
|\ \ \
| * | | user-manual: improve html and pdf formattingta/format-user-manual-as-an-articleThomas Ackermann2014-01-062-2/+2
* | | | Merge branch 'rr/completion-branch-config'Junio C Hamano2014-01-102-5/+29
|\ \ \ \
| * | | | completion: fix remote.pushdefaultrr/completion-branch-configRamkumar Ramachandra2014-01-061-0/+1
| * | | | completion: fix branch.autosetup(merge|rebase)Ramkumar Ramachandra2014-01-061-0/+1
| * | | | completion: introduce __gitcomp_nl_append ()Ramkumar Ramachandra2014-01-062-4/+26
| * | | | zsh completion: find matching custom bash completionRamkumar Ramachandra2014-01-061-1/+1
| | |/ / | |/| |
* | | | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-104-10/+45
|\ \ \ \
| * | | | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-274-10/+45
* | | | | Merge branch 'jk/test-framework-updates'Junio C Hamano2014-01-102-14/+7
|\ \ \ \ \
| * | | | | t0000: drop "known breakage" testjk/test-framework-updatesJeff King2014-01-021-3/+0
| * | | | | t0000: simplify HARNESS_ACTIVE hackJeff King2014-01-022-11/+5
| * | | | | t0000: set TEST_OUTPUT_DIRECTORY for sub-testsJeff King2014-01-021-0/+2
| |/ / / /
* | | | | Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2014-01-102-6/+65
|\ \ \ \ \
| * | | | | merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedupJunio C Hamano2013-12-302-1/+40
| * | | | | merge-base: separate "--independent" codepath into its own helperJunio C Hamano2013-12-301-6/+25
* | | | | | Merge branch 'km/gc-eperm'Junio C Hamano2014-01-101-1/+1
|\ \ \ \ \ \
| * | | | | | gc: notice gc processes run by other userskm/gc-epermKyle J. McKay2014-01-021-1/+1
* | | | | | | Merge branch 'jk/http-auth-tests-robustify'Junio C Hamano2014-01-106-17/+26
|\ \ \ \ \ \ \
| * | | | | | | use distinct username/password for http auth testsjk/http-auth-tests-robustifyJeff King2014-01-026-17/+26
| |/ / / / / /
* | | | | | | Merge branch 'jk/credential-plug-leak'Junio C Hamano2014-01-101-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Revert "prompt: clean up strbuf usage"jk/credential-plug-leakJeff King2014-01-021-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'bs/mirbsd'Junio C Hamano2014-01-102-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Add MirBSD support to the build system.bs/mirbsdBenny Siegert2014-01-022-1/+8
| |/ / / / / /
* | | | | | | Merge branch 'nd/commit-tree-constness'Junio C Hamano2014-01-102-4/+4
|\ \ \ \ \ \ \
| * | | | | | | commit.c: make "tree" a const pointer in commit_tree*()nd/commit-tree-constnessNguyễn Thái Ngọc Duy2013-12-262-4/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/oi-delta-base'Junio C Hamano2014-01-105-3/+103
|\ \ \ \ \ \ \
| * | | | | | | cat-file: provide %(deltabase) batch formatjk/oi-delta-baseJeff King2013-12-263-3/+49
| * | | | | | | sha1_object_info_extended: provide delta base sha1sJeff King2013-12-262-0/+54
* | | | | | | | Merge branch 'jk/sha1write-void'Junio C Hamano2014-01-104-7/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | do not pretend sha1write returns errorsjk/sha1write-voidJeff King2013-12-264-7/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/add-empty-fix'Junio C Hamano2014-01-102-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | add: don't complain when adding empty project rootnd/add-empty-fixNguyễn Thái Ngọc Duy2013-12-262-1/+20
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/daemon-informative-errors-typofix'Junio C Hamano2014-01-101-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | daemon: be strict at parsing parameters --[no-]informative-errorsnd/daemon-informative-errors-typofixNguyễn Thái Ngọc Duy2013-12-201-2/+2
| | |_|_|/ / / / | |/| | | | | |