Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' | Junio C Hamano | 2015-06-11 | 7 | -9/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | suppress errors on missing UNINTERESTING linksjk/squelch-missing-link-warning-for-unreachable | Jeff King | 2015-06-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | silence broken link warnings with revs->ignore_missing_links | Jeff King | 2015-06-01 | 3 | -2/+17 | |
| * | | | | | | | | | | | | | | | | | | | | add quieter versions of parse_{tree,commit} | Jeff King | 2015-06-01 | 4 | -6/+16 | |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-tests' | Junio C Hamano | 2015-06-11 | 2 | -36/+175 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | t5520: check reflog action in fast-forward mergept/pull-tests | Paul Tan | 2015-05-29 | 1 | -3/+10 | |
| * | | | | | | | | | | | | | | | | | | | | t5521: test --dry-run does not make any changes | Paul Tan | 2015-05-29 | 1 | -0/+13 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: test --rebase failure on unborn branch with index | Paul Tan | 2015-05-29 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: test --rebase with multiple branches | Paul Tan | 2015-05-29 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: test work tree fast-forward when fetch updates head | Paul Tan | 2015-05-29 | 1 | -0/+21 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: test for failure if index has unresolved entries | Paul Tan | 2015-05-29 | 1 | -0/+19 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: test no merge candidates cases | Paul Tan | 2015-05-18 | 1 | -0/+55 | |
| * | | | | | | | | | | | | | | | | | | | | t5520: prevent field splitting in content comparisons | Paul Tan | 2015-05-18 | 1 | -35/+35 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/glossary-submodule' | Junio C Hamano | 2015-06-11 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | glossary: add "remote", "submodule", "superproject"sb/glossary-submodule | Stefan Beller | 2015-05-29 | 1 | -0/+16 | |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-doc-intro' | Junio C Hamano | 2015-06-11 | 1 | -28/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | submodule doc: reorder introductory paragraphssb/submodule-doc-intro | Stefan Beller | 2015-05-28 | 1 | -28/+22 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diagnose-config-mmap-failure' | Junio C Hamano | 2015-06-11 | 4 | -11/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | xmmap(): drop "Out of memory?"jk/diagnose-config-mmap-failure | Junio C Hamano | 2015-05-28 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | config.c: rewrite ENODEV into EISDIR when mmap fails | Jeff King | 2015-05-28 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | config.c: avoid xmmap error messages | Jeff King | 2015-05-28 | 3 | -6/+21 | |
| * | | | | | | | | | | | | | | | | | | | config.c: fix mmap leak when writing config | Jeff King | 2015-05-28 | 1 | -4/+5 | |
| * | | | | | | | | | | | | | | | | | | | read-cache.c: drop PROT_WRITE from mmap of index | Jeff King | 2015-05-28 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'mt/p4-depotFile-at-version' | Junio C Hamano | 2015-06-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-version | Miguel Torroja | 2015-05-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/verify-lock-error-report' | Junio C Hamano | 2015-06-11 | 2 | -21/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-report | Michael Haggerty | 2015-05-27 | 2 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): do not capitalize error messages | Michael Haggerty | 2015-05-27 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): report errors via a strbuf | Michael Haggerty | 2015-05-27 | 1 | -7/+12 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): on errors, let the caller unlock the lock | Michael Haggerty | 2015-05-27 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | verify_lock(): return 0/-1 rather than struct ref_lock * | Michael Haggerty | 2015-05-27 | 1 | -7/+14 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 | 5 | -23/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-context | Jeff King | 2015-05-27 | 4 | -20/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | 2 | -2/+3 | |
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-dissociate' | Junio C Hamano | 2015-06-11 | 1 | -13/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | clone: reorder --dissociate and --reference optionsjk/clone-dissociate | Jeff King | 2015-05-27 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | clone: use OPT_STRING_LIST for --reference | Jeff King | 2015-05-27 | 1 | -11/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | 4 | -260/+385 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-26 | 4 | -16/+179 | |
| * | | | | | | | | | | | | | | | | | | | | | diff.c: add emit_del_line() and emit_context_line() | Junio C Hamano | 2015-05-26 | 1 | -12/+38 | |
| * | | | | | | | | | | | | | | | | | | | | | t4015: separate common setup and per-test expectation | Junio C Hamano | 2015-05-26 | 1 | -12/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | t4015: modernise style | Junio C Hamano | 2015-05-26 | 1 | -238/+173 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Sync with 2.4.3 | Junio C Hamano | 2015-06-05 | 2 | -1/+78 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Git 2.4.3v2.4.3 | Junio C Hamano | 2015-06-05 | 4 | -3/+80 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/branch-error-message' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/skip-http-tests-under-no-curl' into maint | Junio C Hamano | 2015-06-05 | 8 | -35/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/doc-packfile-vs-pack-file' into maint | Junio C Hamano | 2015-06-05 | 3 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fg/document-commit-message-stripping' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rerere-forget-check-enabled' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-log-n' into maint | Junio C Hamano | 2015-06-05 | 2 | -2/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |