aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | untracked cache: initial untracked cache validationNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | | | | | untracked cache: record .gitignore information and dir hierarchyNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | | | | | dir.c: optionally compute sha-1 of a .gitignore fileNguyễn Thái Ngọc Duy2015-03-12
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/plug-leak-in-pack-bitmaps'Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsRené Scharfe2015-05-19
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | pull: parse pull.ff as a bool or stringPaul Tan2015-05-18
| * | | | | | | | | | | | | | | | | | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-18
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-log-n'Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | pull: handle --log=<n>Paul Tan2015-05-18
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rerere-forget-check-enabled'Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rerere: exit silently on "forget" when rerere is disabledJeff King2015-05-14
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Fourth batch for 2.5 cycleJunio C Hamano2015-05-22
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | doc: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-22
| * | | | | | | | | | | | | | | | | | | | | | | pack-protocol.txt: fix insconsistent spelling of "packfile"Patrick Steinhardt2015-05-17
| * | | | | | | | | | | | | | | | | | | | | | | git-unpack-objects.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-17
| * | | | | | | | | | | | | | | | | | | | | | | git-verify-pack.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/t1020-cleanup'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | subdirectory tests: code cleanup, uncomment testStefan Beller2015-05-18
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lm/squelch-bg-progress'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | progress: treat "no terminal" as being in the foregroundJeff King2015-05-19
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-epipe-in-filter'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | filter_buffer_or_fd(): ignore EPIPEJunio C Hamano2015-05-20
| * | | | | | | | | | | | | | | | | | | | | | | | copy.c: make copy_fd() report its status silentlyJunio C Hamano2015-05-19
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/clone-verbosity-fix'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | clone: call transport_set_verbosity before anything else on the newly created...Mike Hommey2015-05-19
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-tags-error-diag'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | pull: remove --tags error in no merge candidates casePaul Tan2015-05-14
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/lockfile-retry'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockMichael Haggerty2015-05-14
| * | | | | | | | | | | | | | | | | | | | | | | | | lockfile: allow file locking to be retried with a timeoutMichael Haggerty2015-05-14
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | add: check return value of launch_editorJeff King2015-05-12
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/completion-config'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | completion: simplify query for config variablesSZEDER Gábor2015-05-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | completion: add a helper function to get config variablesSZEDER Gábor2015-05-12
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/ref-directory-file'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | reflog_expire(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): provide better error messagesMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | rename_ref(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | lock_ref_sha1_basic(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | verify_refname_available(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | verify_refname_available(): rename functionMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_commit(): use a string_list for detecting duplicatesMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | is_refname_available(): use dirname in first loopMichael Haggerty2015-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | struct nonmatching_ref_data: store a refname instead of a ref_entryMichael Haggerty2015-05-11