Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pb/recurse-submodules-fix' | Junio C Hamano | 2020-03-27 | 3 | -25/+51 |
|\ | |||||
| * | t/lib-submodule-update: add test removing nested submodules | Philippe Blain | 2020-02-20 | 1 | -2/+18 |
| * | unpack-trees: check for missing submodule directory in merged_entry | Philippe Blain | 2020-02-20 | 2 | -2/+16 |
| * | unpack-trees: remove outdated description for verify_clean_submodule | Philippe Blain | 2020-02-20 | 1 | -3/+0 |
| * | t/lib-submodule-update: move a test to the right section | Philippe Blain | 2020-02-20 | 1 | -16/+17 |
| * | t/lib-submodule-update: remove outdated test description | Philippe Blain | 2020-02-20 | 1 | -1/+0 |
| * | t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED | Philippe Blain | 2020-02-20 | 1 | -1/+0 |
* | | The first batch post 2.26 cycle | Junio C Hamano | 2020-03-25 | 3 | -2/+43 |
* | | Merge branch 'ss/submodule-foreach-cb' | Junio C Hamano | 2020-03-25 | 1 | -4/+4 |
|\ \ | |||||
| * | | submodule--helper.c: Rename 'cb_foreach' to 'foreach_cb' | Shourya Shukla | 2020-03-18 | 1 | -4/+4 |
* | | | Merge branch 'jc/config-tar' | Junio C Hamano | 2020-03-25 | 3 | -7/+8 |
|\ \ \ | |||||
| * | | | separate tar.* config to its own source file | Junio C Hamano | 2020-03-18 | 3 | -7/+8 |
* | | | | Merge branch 'en/oidset-uninclude-hashmap' | Junio C Hamano | 2020-03-25 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | oidset: remove unnecessary include | Elijah Newren | 2020-03-15 | 1 | -1/+0 |
* | | | | | Merge branch 'ds/check-connected-reprepare-packed-git' | Junio C Hamano | 2020-03-25 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | connected.c: reprepare packs for corner cases | Derrick Stolee | 2020-03-15 | 1 | -0/+4 |
* | | | | | | Merge branch 'rs/doc-passthru-fetch-options' | Junio C Hamano | 2020-03-25 | 1 | -3/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull: document more passthru options | René Scharfe | 2020-03-11 | 1 | -3/+7 |
* | | | | | | | Merge branch 'pw/advise-rebase-skip' | Junio C Hamano | 2020-03-25 | 8 | -46/+233 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: give correct advice for empty commit during a rebase | Phillip Wood | 2019-12-06 | 5 | -19/+114 |
| * | | | | | | | commit: encapsulate determine_whence() for sequencer | Phillip Wood | 2019-12-06 | 3 | -6/+15 |
| * | | | | | | | commit: use enum value for multiple cherry-picks | Phillip Wood | 2019-12-06 | 2 | -15/+19 |
| * | | | | | | | sequencer: write CHERRY_PICK_HEAD for reword and edit | Phillip Wood | 2019-12-06 | 2 | -1/+56 |
| * | | | | | | | cherry-pick: check commit error messages | Phillip Wood | 2019-12-06 | 1 | -0/+23 |
| * | | | | | | | cherry-pick: add test for `--skip` advice in `git commit` | Johannes Schindelin | 2019-12-06 | 1 | -1/+2 |
| * | | | | | | | t3404: use test_cmp_rev | Phillip Wood | 2019-12-06 | 1 | -19/+19 |
* | | | | | | | | Merge branch 'yz/p4-py3' | Junio C Hamano | 2020-03-25 | 2 | -95/+146 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere | SZEDER Gábor | 2020-03-10 | 1 | -0/+6 |
| * | | | | | | | | git-p4: use python3's input() everywhere | Yang Zhao | 2020-01-15 | 1 | -2/+12 |
| * | | | | | | | | git-p4: simplify regex pattern generation for parsing diff-tree | Yang Zhao | 2020-01-15 | 1 | -7/+6 |
| * | | | | | | | | git-p4: use dict.items() iteration for python3 compatibility | Yang Zhao | 2020-01-15 | 1 | -1/+1 |
| * | | | | | | | | git-p4: use functools.reduce instead of reduce | Yang Zhao | 2020-01-15 | 1 | -1/+2 |
| * | | | | | | | | git-p4: fix freezing while waiting for fast-import progress | Yang Zhao | 2020-01-15 | 1 | -0/+1 |
| * | | | | | | | | git-p4: use marshal format version 2 when sending to p4 | Yang Zhao | 2020-01-15 | 1 | -1/+2 |
| * | | | | | | | | git-p4: open .gitp4-usercache.txt in text mode | Yang Zhao | 2020-01-15 | 1 | -2/+2 |
| * | | | | | | | | git-p4: convert path to unicode before processing them | Yang Zhao | 2020-01-15 | 1 | -25/+44 |
| * | | | | | | | | git-p4: encode/decode communication with git for python3 | Yang Zhao | 2020-01-15 | 1 | -4/+17 |
| * | | | | | | | | git-p4: encode/decode communication with p4 for python3 | Yang Zhao | 2020-01-15 | 1 | -13/+46 |
| * | | | | | | | | git-p4: remove string type aliasing | Yang Zhao | 2020-01-15 | 1 | -16/+0 |
| * | | | | | | | | git-p4: change the expansion test from basestring to list | Ben Keene | 2020-01-15 | 1 | -9/+9 |
| * | | | | | | | | git-p4: make python2.7 the oldest supported version | Yang Zhao | 2020-01-15 | 1 | -18/+2 |
* | | | | | | | | | Merge branch 'am/real-path-fix' | Junio C Hamano | 2020-03-25 | 16 | -75/+107 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | get_superproject_working_tree(): return strbuf | Alexandr Miloslavskiy | 2020-03-10 | 3 | -14/+14 |
| * | | | | | | | | | real_path_if_valid(): remove unsafe API | Alexandr Miloslavskiy | 2020-03-10 | 6 | -26/+14 |
| * | | | | | | | | | real_path: remove unsafe API | Alexandr Miloslavskiy | 2020-03-10 | 13 | -24/+59 |
| * | | | | | | | | | set_git_dir: fix crash when used with real_path() | Alexandr Miloslavskiy | 2020-03-06 | 5 | -14/+23 |
* | | | | | | | | | | Merge branch 'sg/commit-slab-clarify-peek' | Junio C Hamano | 2020-03-25 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | commit-slab: clarify slabname##_peek()'s return value | SZEDER Gábor | 2020-03-10 | 1 | -1/+6 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/maintain-doc' | Junio C Hamano | 2020-03-25 | 1 | -13/+39 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update how-to-maintain-git | Junio C Hamano | 2020-03-09 | 1 | -13/+39 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | |