Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-update | David Turner | 2015-08-31 | 3 | -5/+15 |
* | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 | 2 | -1/+108 |
|\ | |||||
| * | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fix | Jeff King | 2015-08-10 | 2 | -7/+8 |
| * | clone: add tests for output directory | Jeff King | 2015-08-10 | 1 | -0/+106 |
* | | Merge branch 'jk/test-with-x' into maint | Junio C Hamano | 2015-08-25 | 1 | -2/+11 |
|\ \ | |||||
| * | | test-lib: disable trace when test is not verbosejk/test-with-x | Jeff King | 2015-08-07 | 1 | -2/+6 |
| * | | test-lib: turn off "-x" tracing during chain-lint check | Jeff King | 2015-08-07 | 1 | -0/+5 |
* | | | Merge branch 'sb/check-return-from-read-ref' into maint | Junio C Hamano | 2015-08-25 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | transport-helper: die on errors reading refs.sb/check-return-from-read-ref | Stefan Beller | 2015-08-03 | 1 | -2/+6 |
* | | | | Merge branch 'mm/pull-upload-pack' into maint | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | pull: pass upload_pack only when it was givenmm/pull-upload-pack | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
| * | | | | pull.sh: quote $upload_pack when passing it to git-fetch | Matthieu Moy | 2015-07-30 | 1 | -1/+1 |
* | | | | | Start preparing for 2.5.1 | Junio C Hamano | 2015-08-19 | 2 | -1/+50 |
* | | | | | Merge branch 'ta/docfix-index-format-tech' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | typofix for index-format.txtta/docfix-index-format-tech | Thomas Ackermann | 2015-07-28 | 1 | -1/+1 |
* | | | | | | Merge branch 'sb/parse-options-codeformat' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | parse-options: align curly braces for all optionssb/parse-options-codeformat | Stefan Beller | 2015-07-29 | 1 | -1/+1 |
* | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add: remove dead codesb/remove-unused-var-from-builtin-add | Stefan Beller | 2015-07-31 | 1 | -2/+0 |
* | | | | | | | | Merge branch 'kn/tag-doc-fix' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fix | Karthik Nayak | 2015-07-10 | 1 | -1/+0 |
* | | | | | | | | | Merge branch 'es/doc-clean-outdated-tools' into maint | Junio C Hamano | 2015-08-19 | 2 | -117/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/git-tools: retire manually-maintained listes/doc-clean-outdated-tools | Eric Sunshine | 2015-07-28 | 1 | -81/+7 |
| * | | | | | | | | | Documentation/git-tools: drop references to defunct tools | Eric Sunshine | 2015-07-28 | 1 | -31/+0 |
| * | | | | | | | | | Documentation/git-tools: fix item text formatting | Eric Sunshine | 2015-07-28 | 1 | -67/+67 |
| * | | | | | | | | | Documentation/git-tools: improve discoverability of Git wiki | Eric Sunshine | 2015-07-28 | 1 | -6/+3 |
| * | | | | | | | | | Documentation/git: drop outdated Cogito reference | Eric Sunshine | 2015-07-25 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'nd/export-worktree' into maint | Junio C Hamano | 2015-08-19 | 2 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIRnd/export-worktree | Nguyễn Thái Ngọc Duy | 2015-06-26 | 2 | -0/+19 |
* | | | | | | | | | | | Merge branch 'mh/fast-import-optimize-current-from' into maint | Junio C Hamano | 2015-08-19 | 1 | -12/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fast-import: do less work when given "from" matches current branch headmh/fast-import-optimize-current-from | Mike Hommey | 2015-07-13 | 1 | -12/+17 |
* | | | | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 3 | -68/+92 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-string | Ilya Bobyr | 2015-07-15 | 3 | -68/+92 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'se/doc-checkout-ours-theirs' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirs | Simon A. Eugster | 2015-07-12 | 1 | -0/+15 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'cb/uname-in-untracked' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | untracked: fix detection of uname(2) failurecb/uname-in-untracked | Charles Bailey | 2015-07-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'as/sparse-checkout-removal' into maint | Junio C Hamano | 2015-08-19 | 2 | -0/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removal | David Turner | 2015-07-21 | 2 | -0/+56 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | builtin/send-pack.c: respect user.signingkeydb/send-pack-user-signingkey | Junio C Hamano | 2015-07-21 | 1 | -0/+3 |
* | | | | | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | receive-pack: crash when checking with non-exist HEADjx/do-not-crash-receive-pack-wo-head | Jiang Xin | 2015-07-22 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'da/subtree-date-confusion' into maint | Junio C Hamano | 2015-08-19 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | contrib/subtree: ignore log.date configurationda/subtree-date-confusion | David Aguilar | 2015-07-23 | 2 | -1/+5 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Sync with 2.4.8 | Junio C Hamano | 2015-08-03 | 3 | -4/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Git 2.4.8v2.4.8 | Junio C Hamano | 2015-08-03 | 4 | -5/+25 |
| * | | | | | | | | | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 | 2 | -1/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 | 1 | -13/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'sg/completion-commit-cleanup' into maint | Junio C Hamano | 2015-08-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |