Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Merge branch 'pt/pull-log-n' | Junio C Hamano | 2015-05-26 | 2 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pull: handle --log=<n>pt/pull-log-n | Paul Tan | 2015-05-18 | 2 | -2/+19 | |
* | | | | | | | | | | | | | | Merge branch 'jk/rerere-forget-check-enabled' | Junio C Hamano | 2015-05-26 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | rerere: exit silently on "forget" when rerere is disabledjk/rerere-forget-check-enabled | Jeff King | 2015-05-14 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | Fourth batch for 2.5 cycle | Junio C Hamano | 2015-05-22 | 1 | -0/+75 | |
* | | | | | | | | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file' | Junio C Hamano | 2015-05-22 | 3 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | doc: fix inconsistent spelling of "packfile"ps/doc-packfile-vs-pack-file | Patrick Steinhardt | 2015-05-22 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | pack-protocol.txt: fix insconsistent spelling of "packfile" | Patrick Steinhardt | 2015-05-17 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | git-unpack-objects.txt: fix inconsistent spelling of "packfile" | Patrick Steinhardt | 2015-05-17 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | git-verify-pack.txt: fix inconsistent spelling of "packfile" | Patrick Steinhardt | 2015-05-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | Merge branch 'sb/t1020-cleanup' | Junio C Hamano | 2015-05-22 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | subdirectory tests: code cleanup, uncomment testsb/t1020-cleanup | Stefan Beller | 2015-05-18 | 1 | -4/+7 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'lm/squelch-bg-progress' | Junio C Hamano | 2015-05-22 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | progress: treat "no terminal" as being in the foregroundlm/squelch-bg-progress | Jeff King | 2015-05-19 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-epipe-in-filter' | Junio C Hamano | 2015-05-22 | 5 | -8/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | filter_buffer_or_fd(): ignore EPIPEjc/ignore-epipe-in-filter | Junio C Hamano | 2015-05-20 | 2 | -1/+16 | |
| * | | | | | | | | | | | | | | | | | copy.c: make copy_fd() report its status silently | Junio C Hamano | 2015-05-19 | 3 | -7/+16 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'mh/clone-verbosity-fix' | Junio C Hamano | 2015-05-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | clone: call transport_set_verbosity before anything else on the newly created...mh/clone-verbosity-fix | Mike Hommey | 2015-05-19 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-tags-error-diag' | Junio C Hamano | 2015-05-22 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | pull: remove --tags error in no merge candidates casept/pull-tags-error-diag | Paul Tan | 2015-05-14 | 1 | -9/+0 | |
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/lockfile-retry' | Junio C Hamano | 2015-05-22 | 5 | -5/+125 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockmh/lockfile-retry | Michael Haggerty | 2015-05-14 | 3 | -1/+34 | |
| * | | | | | | | | | | | | | | | | | | lockfile: allow file locking to be retried with a timeout | Michael Haggerty | 2015-05-14 | 2 | -4/+91 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor' | Junio C Hamano | 2015-05-22 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | add: check return value of launch_editorjk/add-e-kill-editor | Jeff King | 2015-05-12 | 2 | -1/+9 | |
| | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/completion-config' | Junio C Hamano | 2015-05-22 | 2 | -24/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | completion: simplify query for config variablessg/completion-config | SZEDER Gábor | 2015-05-12 | 2 | -7/+15 | |
| * | | | | | | | | | | | | | | | | | | | completion: add a helper function to get config variables | SZEDER Gábor | 2015-05-12 | 2 | -20/+36 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/ref-directory-file' | Junio C Hamano | 2015-05-22 | 3 | -118/+312 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | reflog_expire(): integrate lock_ref_sha1_basic() errors into oursmh/ref-directory-file-3mh/ref-directory-file | Michael Haggerty | 2015-05-11 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): delete extra "the" from error message | Michael Haggerty | 2015-05-11 | 2 | -8/+8 | |
| * | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): provide better error messages | Michael Haggerty | 2015-05-11 | 1 | -4/+6 | |
| * | | | | | | | | | | | | | | | | | | | | rename_ref(): integrate lock_ref_sha1_basic() errors into ours | Michael Haggerty | 2015-05-11 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | | | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts | Michael Haggerty | 2015-05-11 | 2 | -8/+16 | |
| * | | | | | | | | | | | | | | | | | | | | lock_ref_sha1_basic(): report errors via a "struct strbuf *err" | Michael Haggerty | 2015-05-11 | 1 | -16/+28 | |
| * | | | | | | | | | | | | | | | | | | | | verify_refname_available(): report errors via a "struct strbuf *err" | Michael Haggerty | 2015-05-11 | 1 | -20/+30 | |
| * | | | | | | | | | | | | | | | | | | | | verify_refname_available(): rename function | Michael Haggerty | 2015-05-11 | 1 | -17/+20 | |
| * | | | | | | | | | | | | | | | | | | | | refs: check for D/F conflicts among refs created in a transaction | Michael Haggerty | 2015-05-11 | 2 | -63/+95 | |
| * | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): use a string_list for detecting duplicates | Michael Haggerty | 2015-05-11 | 1 | -14/+11 | |
| * | | | | | | | | | | | | | | | | | | | | is_refname_available(): use dirname in first loop | Michael Haggerty | 2015-05-11 | 1 | -14/+26 | |
| * | | | | | | | | | | | | | | | | | | | | struct nonmatching_ref_data: store a refname instead of a ref_entry | Michael Haggerty | 2015-05-11 | 1 | -3/+4 | |
| * | | | | | | | | | | | | | | | | | | | | report_refname_conflict(): inline function | Michael Haggerty | 2015-05-11 | 1 | -8/+2 | |
| * | | | | | | | | | | | | | | | | | | | | entry_matches(): inline function | Michael Haggerty | 2015-05-11 | 1 | -7/+2 | |
| * | | | | | | | | | | | | | | | | | | | | is_refname_available(): convert local variable "dirname" to strbuf | Michael Haggerty | 2015-05-11 | 1 | -7/+5 | |
| * | | | | | | | | | | | | | | | | | | | | is_refname_available(): avoid shadowing "dir" variable | Michael Haggerty | 2015-05-11 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | is_refname_available(): revamp the comments | Michael Haggerty | 2015-05-11 | 1 | -22/+47 | |
| * | | | | | | | | | | | | | | | | | | | | t1404: new tests of ref D/F conflicts within transactions | Michael Haggerty | 2015-05-11 | 1 | -0/+107 | |
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/write-refs-sooner-2.4' | Junio C Hamano | 2015-05-22 | 3 | -33/+112 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/write-refs-sooner-2.3' into mh/write-refs-sooner-2.4mh/write-refs-sooner-2.4 | Junio C Hamano | 2015-05-12 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |