Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | t9824: fix broken &&-chain in a subshell | SZEDER Gábor | 2016-04-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-05-06 | 21 | -98/+109 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | match-trees: convert several leaf functions to use struct object_id | brian m. carlson | 2016-04-25 | 1 | -15/+15 | |
| * | | | | | | | | | | | | | | | | | | tree-walk: convert tree_entry_extract() to use struct object_id | brian m. carlson | 2016-04-25 | 5 | -17/+17 | |
| * | | | | | | | | | | | | | | | | | | struct name_entry: use struct object_id instead of unsigned char sha1[20] | brian m. carlson | 2016-04-25 | 17 | -48/+48 | |
| * | | | | | | | | | | | | | | | | | | match-trees: convert shift_tree() and shift_tree_by() to use object_id | brian m. carlson | 2016-04-19 | 4 | -27/+27 | |
| * | | | | | | | | | | | | | | | | | | test-match-trees: convert to use struct object_id | brian m. carlson | 2016-04-19 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | | | | | | sha1-name: introduce a get_oid() function | brian m. carlson | 2016-04-19 | 2 | -0/+11 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bw/rebase-merge-entire-branch' | Junio C Hamano | 2016-05-06 | 3 | -3/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | git-rebase--merge: don't include absent parent as a basebw/rebase-merge-entire-branch | Ben Woosley | 2016-04-24 | 3 | -3/+14 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/drop-git-spec-in' | Junio C Hamano | 2016-05-06 | 2 | -343/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Makefile: remove dependency on git.specjc/drop-git-spec-in | Dennis Kaarsemaker | 2016-04-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Makefile: stop pretending to support rpmbuild | Junio C Hamano | 2016-04-06 | 2 | -342/+5 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/http-custom-headers' | Junio C Hamano | 2016-05-06 | 7 | -10/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | http: support sending custom HTTP headers | Johannes Schindelin | 2016-04-27 | 7 | -10/+61 | |
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' | Junio C Hamano | 2016-05-06 | 3 | -3/+100 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | clone: add `--shallow-submodules` flag | Stefan Beller | 2016-04-26 | 3 | -3/+102 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-test-py3' | Junio C Hamano | 2016-05-06 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3 | Luke Diamand | 2016-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | git-p4 tests: work with python3 as well as python2 | Luke Diamand | 2016-04-26 | 2 | -5/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | git-p4 tests: cd to / before running python | Luke Diamand | 2016-04-26 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/config-exit-status-list' | Junio C Hamano | 2016-05-06 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | config doc: improve exit code listingsb/config-exit-status-list | Stefan Beller | 2016-04-26 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-05-03 | 8 | -143/+476 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | git-multimail: update to release 1.3.0 | Matthieu Moy | 2016-05-03 | 8 | -143/+476 | |
* | | | | | | | | | | | | | | | | | | | | | | Ninth batch for 2.9 | Junio C Hamano | 2016-05-03 | 1 | -46/+30 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nf/mergetool-prompt' | Junio C Hamano | 2016-05-03 | 4 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt | Nikola Forró | 2016-04-25 | 4 | -5/+5 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jd/send-email-to-whom' | Junio C Hamano | 2016-05-03 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | send-email: fix grammo in the prompt that asks e-mail recipientsjd/send-email-to-whom | Junio C Hamano | 2016-04-25 | 1 | -2/+3 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/string-list-lookup-cleanup' | Junio C Hamano | 2016-05-03 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | string_list: use string-list API in unsorted_string_list_lookup()rt/string-list-lookup-cleanup | Ralf Thielow | 2016-04-25 | 1 | -4/+4 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-attribute-macro-in-2.5' | Junio C Hamano | 2016-05-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | remote.c: spell __attribute__ correctlyjk/fix-attribute-macro-in-2.5 | Jeff King | 2016-04-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/test-lib-simplify-expr-away' | Junio C Hamano | 2016-05-03 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-away | SZEDER Gábor | 2016-04-22 | 1 | -5/+5 | |
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/remove-unused' | Junio C Hamano | 2016-05-03 | 4 | -27/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | wrapper.c: delete dead function git_mkstemps()nd/remove-unused | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -19/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | dir.c: remove dead function fnmatch_icase() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -8/+0 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/name-rev-use-oldest-ref' | Junio C Hamano | 2016-05-03 | 2 | -7/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-ref | Johannes Schindelin | 2016-04-22 | 2 | -7/+14 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jd/p4-jobs-in-commit' | Junio C Hamano | 2016-05-03 | 4 | -42/+162 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commit | Jan Durovec | 2016-04-19 | 3 | -0/+120 | |
| * | | | | | | | | | | | | | | | | | | | | | | | git-p4: clean-up code style in tests | Jan Durovec | 2016-04-19 | 2 | -42/+42 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'en/merge-fixes' | Junio C Hamano | 2016-05-03 | 1 | -5/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: do not check working copy when creating a virtual merge baseen/merge-fixes | Elijah Newren | 2016-04-12 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: remove duplicate code | Elijah Newren | 2016-04-12 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-05-02 | 1 | -0/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Start preparing for 2.8.3 | Junio C Hamano | 2016-05-02 | 1 | -0/+61 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/use-write-script-more' into maint | Junio C Hamano | 2016-05-02 | 3 | -18/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |