Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'br/sha1-name-40-hex-no-disambiguation' | Junio C Hamano | 2014-01-13 | 1 | -2/+2 |
|\ | |||||
| * | sha1_name: don't resolve refs when core.warnambiguousrefs is falsebr/sha1-name-40-hex-no-disambiguation | Brodie Rao | 2014-01-07 | 1 | -2/+2 |
* | | Update draft release notes to 1.9 | Junio C Hamano | 2014-01-10 | 1 | -1/+114 |
* | | Merge branch 'ss/builtin-cleanup' | Junio C Hamano | 2014-01-10 | 4 | -125/+143 |
|\ \ | |||||
| * | | builtin/help.c: speed up is_git_command() by checking for builtin commands firstss/builtin-cleanup | Sebastian Schuberth | 2014-01-06 | 4 | -117/+134 |
| * | | builtin/help.c: call load_command_list() only when it is needed | Sebastian Schuberth | 2014-01-06 | 1 | -1/+2 |
| * | | git.c: consistently use the term "builtin" instead of "internal command" | Sebastian Schuberth | 2014-01-06 | 2 | -8/+8 |
* | | | Merge branch 'vm/octopus-merge-bases-simplify' | Junio C Hamano | 2014-01-10 | 1 | -18/+18 |
|\ \ \ | |||||
| * | | | get_octopus_merge_bases(): cleanup redundant variablevm/octopus-merge-bases-simplify | Vasily Makarov | 2014-01-03 | 1 | -18/+18 |
| |/ / | |||||
* | | | Merge branch 'ta/format-user-manual-as-an-article' | Junio C Hamano | 2014-01-10 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | user-manual: improve html and pdf formattingta/format-user-manual-as-an-article | Thomas Ackermann | 2014-01-06 | 2 | -2/+2 |
* | | | | Merge branch 'rr/completion-branch-config' | Junio C Hamano | 2014-01-10 | 2 | -5/+29 |
|\ \ \ \ | |||||
| * | | | | completion: fix remote.pushdefaultrr/completion-branch-config | Ramkumar Ramachandra | 2014-01-06 | 1 | -0/+1 |
| * | | | | completion: fix branch.autosetup(merge|rebase) | Ramkumar Ramachandra | 2014-01-06 | 1 | -0/+1 |
| * | | | | completion: introduce __gitcomp_nl_append () | Ramkumar Ramachandra | 2014-01-06 | 2 | -4/+26 |
| * | | | | zsh completion: find matching custom bash completion | Ramkumar Ramachandra | 2014-01-06 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'js/lift-parent-count-limit' | Junio C Hamano | 2014-01-10 | 4 | -10/+45 |
|\ \ \ \ | |||||
| * | | | | Remove the line length limit for graft filesjs/lift-parent-count-limit | Johannes Schindelin | 2013-12-27 | 4 | -10/+45 |
* | | | | | Merge branch 'jk/test-framework-updates' | Junio C Hamano | 2014-01-10 | 2 | -14/+7 |
|\ \ \ \ \ | |||||
| * | | | | | t0000: drop "known breakage" testjk/test-framework-updates | Jeff King | 2014-01-02 | 1 | -3/+0 |
| * | | | | | t0000: simplify HARNESS_ACTIVE hack | Jeff King | 2014-01-02 | 2 | -11/+5 |
| * | | | | | t0000: set TEST_OUTPUT_DIRECTORY for sub-tests | Jeff King | 2014-01-02 | 1 | -0/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'bm/merge-base-octopus-dedup' | Junio C Hamano | 2014-01-10 | 2 | -6/+65 |
|\ \ \ \ \ | |||||
| * | | | | | merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedup | Junio C Hamano | 2013-12-30 | 2 | -1/+40 |
| * | | | | | merge-base: separate "--independent" codepath into its own helper | Junio C Hamano | 2013-12-30 | 1 | -6/+25 |
* | | | | | | Merge branch 'km/gc-eperm' | Junio C Hamano | 2014-01-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gc: notice gc processes run by other userskm/gc-eperm | Kyle J. McKay | 2014-01-02 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/http-auth-tests-robustify' | Junio C Hamano | 2014-01-10 | 6 | -17/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use distinct username/password for http auth testsjk/http-auth-tests-robustify | Jeff King | 2014-01-02 | 6 | -17/+26 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/credential-plug-leak' | Junio C Hamano | 2014-01-10 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "prompt: clean up strbuf usage"jk/credential-plug-leak | Jeff King | 2014-01-02 | 1 | -1/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'bs/mirbsd' | Junio C Hamano | 2014-01-10 | 2 | -1/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add MirBSD support to the build system.bs/mirbsd | Benny Siegert | 2014-01-02 | 2 | -1/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'nd/commit-tree-constness' | Junio C Hamano | 2014-01-10 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit.c: make "tree" a const pointer in commit_tree*()nd/commit-tree-constness | Nguyễn Thái Ngọc Duy | 2013-12-26 | 2 | -4/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/oi-delta-base' | Junio C Hamano | 2014-01-10 | 5 | -3/+103 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cat-file: provide %(deltabase) batch formatjk/oi-delta-base | Jeff King | 2013-12-26 | 3 | -3/+49 |
| * | | | | | | | sha1_object_info_extended: provide delta base sha1s | Jeff King | 2013-12-26 | 2 | -0/+54 |
* | | | | | | | | Merge branch 'jk/sha1write-void' | Junio C Hamano | 2014-01-10 | 4 | -7/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | do not pretend sha1write returns errorsjk/sha1write-void | Jeff King | 2013-12-26 | 4 | -7/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'nd/add-empty-fix' | Junio C Hamano | 2014-01-10 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add: don't complain when adding empty project rootnd/add-empty-fix | Nguyễn Thái Ngọc Duy | 2013-12-26 | 2 | -1/+20 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/daemon-informative-errors-typofix' | Junio C Hamano | 2014-01-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | daemon: be strict at parsing parameters --[no-]informative-errorsnd/daemon-informative-errors-typofix | Nguyễn Thái Ngọc Duy | 2013-12-20 | 1 | -2/+2 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'tm/fetch-prune' | Junio C Hamano | 2014-01-10 | 2 | -10/+58 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch --prune: Run prune before fetchingtm/fetch-prune | Tom Miller | 2014-01-03 | 2 | -5/+19 |
| * | | | | | | | | fetch --prune: always print header url | Tom Miller | 2014-01-03 | 2 | -5/+39 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sb/diff-orderfile-config' | Junio C Hamano | 2014-01-10 | 5 | -15/+125 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: add diff.orderfile configuration variable | Samuel Bronson | 2013-12-18 | 4 | -0/+23 |
| * | | | | | | | | diff: let "git diff -O" read orderfile from any file and fail properly | Samuel Bronson | 2013-12-18 | 2 | -15/+34 |