summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refnamekn/for-each-refKarthik Nayak2015-08-032-4/+5
* for-each-ref: introduce filter_refs()Karthik Nayak2015-08-033-18/+49
* ref-filter: move code from 'for-each-ref'Karthik Nayak2015-08-033-1074/+1079
* ref-filter: add 'ref-filter.h'Karthik Nayak2015-06-152-40/+67
* for-each-ref: rename variables called sort to sortingKarthik Nayak2015-06-151-14/+14
* for-each-ref: rename some functions and make them publicKarthik Nayak2015-06-151-32/+32
* for-each-ref: introduce 'ref_array_clear()'Karthik Nayak2015-06-151-0/+21
* for-each-ref: introduce new structures for better organisationKarthik Nayak2015-06-151-24/+30
* for-each-ref: rename 'refinfo' to 'ref_array_item'Karthik Nayak2015-06-151-20/+20
* for-each-ref: clean up codeKarthik Nayak2015-06-151-5/+2
* for-each-ref: extract helper functions out of grab_single_ref()Karthik Nayak2015-06-151-23/+41
* Second half of seventh batchJunio C Hamano2015-06-111-0/+28
* Merge branch 'tb/complete-sequencing'Junio C Hamano2015-06-111-0/+5
|\
| * completion: suggest sequencer commands for reverttb/complete-sequencingThomas Braun2015-06-011-0/+5
* | Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Junio C Hamano2015-06-117-9/+34
|\ \
| * | suppress errors on missing UNINTERESTING linksjk/squelch-missing-link-warning-for-unreachableJeff King2015-06-011-1/+1
| * | silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-013-2/+17
| * | add quieter versions of parse_{tree,commit}Jeff King2015-06-014-6/+16
* | | Merge branch 'pt/pull-tests'Junio C Hamano2015-06-112-36/+175
|\ \ \
| * | | t5520: check reflog action in fast-forward mergept/pull-testsPaul Tan2015-05-291-3/+10
| * | | t5521: test --dry-run does not make any changesPaul Tan2015-05-291-0/+13
| * | | t5520: test --rebase failure on unborn branch with indexPaul Tan2015-05-291-0/+15
| * | | t5520: test --rebase with multiple branchesPaul Tan2015-05-291-0/+9
| * | | t5520: test work tree fast-forward when fetch updates headPaul Tan2015-05-291-0/+21
| * | | t5520: test for failure if index has unresolved entriesPaul Tan2015-05-291-0/+19
| * | | t5520: test no merge candidates casesPaul Tan2015-05-181-0/+55
| * | | t5520: prevent field splitting in content comparisonsPaul Tan2015-05-181-35/+35
* | | | Merge branch 'sb/glossary-submodule'Junio C Hamano2015-06-111-0/+16
|\ \ \ \
| * | | | glossary: add "remote", "submodule", "superproject"sb/glossary-submoduleStefan Beller2015-05-291-0/+16
| | |_|/ | |/| |
* | | | Merge branch 'sb/submodule-doc-intro'Junio C Hamano2015-06-111-28/+22
|\ \ \ \
| * | | | submodule doc: reorder introductory paragraphssb/submodule-doc-introStefan Beller2015-05-281-28/+22
| |/ / /
* | | | Merge branch 'jk/diagnose-config-mmap-failure'Junio C Hamano2015-06-114-11/+29
|\ \ \ \
| * | | | xmmap(): drop "Out of memory?"jk/diagnose-config-mmap-failureJunio C Hamano2015-05-281-1/+1
| * | | | config.c: rewrite ENODEV into EISDIR when mmap failsJeff King2015-05-281-0/+2
| * | | | config.c: avoid xmmap error messagesJeff King2015-05-283-6/+21
| * | | | config.c: fix mmap leak when writing configJeff King2015-05-281-4/+5
| * | | | read-cache.c: drop PROT_WRITE from mmap of indexJeff King2015-05-281-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano2015-06-111-1/+1
|\ \ \ \
| * | | | p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-versionMiguel Torroja2015-05-271-1/+1
* | | | | Merge branch 'mh/verify-lock-error-report'Junio C Hamano2015-06-112-21/+33
|\ \ \ \ \
| * | | | | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-reportMichael Haggerty2015-05-272-9/+9
| * | | | | verify_lock(): do not capitalize error messagesMichael Haggerty2015-05-271-2/+2
| * | | | | verify_lock(): report errors via a strbufMichael Haggerty2015-05-271-7/+12
| * | | | | verify_lock(): on errors, let the caller unlock the lockMichael Haggerty2015-05-271-4/+4
| * | | | | verify_lock(): return 0/-1 rather than struct ref_lock *Michael Haggerty2015-05-271-7/+14
* | | | | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-115-23/+24
|\ \ \ \ \ \
| * | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-274-20/+20
| * | | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-272-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/clone-dissociate'Junio C Hamano2015-06-111-13/+4
|\ \ \ \ \ \
| * | | | | | clone: reorder --dissociate and --reference optionsjk/clone-dissociateJeff King2015-05-271-2/+2