Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/setup-cleanup-fix' | Junio C Hamano | 2016-11-23 | 3 | -8/+19 |
|\ | |||||
| * | archive: read local configurationjc/setup-cleanup-fix | Junio C Hamano | 2016-11-22 | 2 | -4/+4 |
| * | mailinfo: read local configuration | Junio C Hamano | 2016-11-22 | 1 | -4/+15 |
* | | Merge branch 'js/rebase-i-commentchar-fix' | Junio C Hamano | 2016-11-23 | 1 | -1/+3 |
|\ \ | |/ |/| | |||||
| * | stripspace: respect repository config | Johannes Schindelin | 2016-11-21 | 1 | -1/+3 |
* | | Merge branch 'jk/create-branch-remove-unused-param' | Junio C Hamano | 2016-11-17 | 2 | -3/+3 |
|\ \ | |||||
| * | | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-param | Jeff King | 2016-11-09 | 2 | -3/+3 |
* | | | Merge branch 'rs/commit-pptr-simplify' | Junio C Hamano | 2016-10-31 | 1 | -8/+6 |
|\ \ \ | |||||
| * | | | commit: simplify building parents listrs/commit-pptr-simplify | René Scharfe | 2016-10-30 | 1 | -8/+6 |
| | |/ | |/| | |||||
* | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-10-31 | 4 | -8/+8 |
|\ \ \ | |||||
| * | | | pkt-line: rename packet_write() to packet_write_fmt() | Lars Schneider | 2016-10-17 | 4 | -8/+8 |
* | | | | Merge branch 'ls/git-open-cloexec' | Junio C Hamano | 2016-10-31 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | sha1_file: rename git_open_noatime() to git_open() | Lars Schneider | 2016-10-25 | 1 | -1/+1 |
* | | | | | Merge branch 'nd/ita-empty-commit' | Junio C Hamano | 2016-10-27 | 1 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | commit: don't be fooled by ita entries when creating initial commitnd/ita-empty-commit | Nguyễn Thái Ngọc Duy | 2016-10-24 | 1 | -3/+8 |
| * | | | | | commit: fix empty commit creation when there's no changes but ita entries | Nguyễn Thái Ngọc Duy | 2016-10-24 | 1 | -1/+1 |
* | | | | | | Merge branch 'js/prepare-sequencer' | Junio C Hamano | 2016-10-27 | 2 | -25/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sequencer: get rid of the subcommand field | Johannes Schindelin | 2016-10-21 | 1 | -20/+16 |
| * | | | | | | sequencer: plug memory leaks for the option values | Johannes Schindelin | 2016-10-21 | 1 | -0/+4 |
| * | | | | | | sequencer: use memoized sequencer directory path | Johannes Schindelin | 2016-10-17 | 1 | -1/+1 |
| * | | | | | | sequencer: use static initializers for replay_opts | Johannes Schindelin | 2016-10-17 | 1 | -4/+2 |
* | | | | | | | Merge branch 'sb/submodule-ignore-trailing-slash' | Junio C Hamano | 2016-10-27 | 1 | -2/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule: ignore trailing slash in relative url | Stefan Beller | 2016-10-10 | 1 | -0/+2 |
| * | | | | | | | submodule: ignore trailing slash on superproject URL | Stefan Beller | 2016-10-10 | 1 | -2/+4 |
* | | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo' | Junio C Hamano | 2016-10-27 | 2 | -16/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | find_unique_abbrev: use 4-buffer ring | Jeff King | 2016-10-26 | 2 | -16/+11 |
* | | | | | | | | | Merge branch 'jc/abbrev-auto' | Junio C Hamano | 2016-10-27 | 1 | -16/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | transport: allow summary-width to be computed dynamically | Junio C Hamano | 2016-10-21 | 1 | -2/+2 |
| * | | | | | | | | | fetch: pass summary_width down the callchain | Junio C Hamano | 2016-10-21 | 1 | -16/+21 |
* | | | | | | | | | | Merge branch 'lt/abbrev-auto' | Junio C Hamano | 2016-10-27 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | abbrev: prepare for new world order | Junio C Hamano | 2016-10-03 | 1 | -2/+3 |
| * | | | | | | | | abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing | Junio C Hamano | 2016-10-03 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'jk/diff-submodule-diff-inline' | Junio C Hamano | 2016-10-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rev-list: use hdr_termination instead of a always using a newline | Jacob Keller | 2016-10-20 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jk/fetch-quick-tag-following' | Junio C Hamano | 2016-10-26 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-following | Jeff King | 2016-10-14 | 1 | -4/+7 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-09-08 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint | Junio C Hamano | 2016-09-08 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/merge-add-strategies-simplification' into maint | Junio C Hamano | 2016-09-08 | 1 | -34/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/no-html-bypass-on-windows' into maint | Junio C Hamano | 2016-09-08 | 1 | -7/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/checkout-explit-detach-no-advice' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/mv-dir-to-new-directory' into maint | Junio C Hamano | 2016-09-08 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/merge-base-fork-point-without-reflog' | Junio C Hamano | 2016-10-26 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflog | Jeff King | 2016-10-12 | 1 | -0/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules' | Junio C Hamano | 2016-10-26 | 1 | -40/+141 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | ls-files: add pathspec matching for submodulesbw/ls-files-recurse-submodules | Brandon Williams | 2016-10-10 | 1 | -6/+21 |
| * | | | | | | | | | | | | | | | | | ls-files: pass through safe options for --recurse-submodules | Brandon Williams | 2016-10-10 | 1 | -3/+27 |
| * | | | | | | | | | | | | | | | | | ls-files: optionally recurse into submodules | Brandon Williams | 2016-10-10 | 1 | -38/+100 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/libify-require-clean-work-tree' | Junio C Hamano | 2016-10-26 | 1 | -68/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |