summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7600: fix typo in test titlemv/merge-ff-tristateJunio C Hamano2013-07-231-1/+1
* merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-022-25/+42
* Merge branch 'maint'Junio C Hamano2013-06-303-3/+14
|\
| * Start preparing for 1.8.3.3Junio C Hamano2013-06-302-1/+12
| * Merge branch 'fc/macos-x-clipped-write' into maintJunio C Hamano2013-06-304-0/+27
| |\
| * \ Merge branch 'da/darwin' into maintJunio C Hamano2013-06-302-0/+25
| |\ \
| * | | check-ignore doc: fix broken link to ls-files pageRamkumar Ramachandra2013-06-301-1/+1
| * | | test: spell 'ls-files --delete' option correctly in test descriptionsSZEDER Gábor2013-06-301-2/+2
* | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-301-0/+23
* | | | Merge branch 'mh/ref-races'Junio C Hamano2013-06-306-134/+466
|\ \ \ \
| * | | | for_each_ref: load all loose refs before packed refsJeff King2013-06-201-4/+35
| * | | | get_packed_ref_cache: reload packed-refs file when it changesJeff King2013-06-201-5/+16
| * | | | add a stat_validity structMichael Haggerty2013-06-202-0/+57
| * | | | Extract a struct stat_data from cache_entryMichael Haggerty2013-06-203-80/+116
| * | | | packed_ref_cache: increment refcount when lockedMichael Haggerty2013-06-201-1/+7
| * | | | do_for_each_entry(): increment the packed refs cache refcountMichael Haggerty2013-06-201-1/+4
| * | | | refs: manage lifetime of packed refs cache via reference countingMichael Haggerty2013-06-201-3/+36
| * | | | refs: implement simple transactions for the packed-refs fileMichael Haggerty2013-06-203-21/+98
| * | | | refs: wrap the packed refs cache in a level of indirectionMichael Haggerty2013-06-201-6/+26
| * | | | pack_refs(): split creation of packed refs and entry writingMichael Haggerty2013-06-201-14/+34
| * | | | repack_without_ref(): split list curation and entry writingMichael Haggerty2013-06-201-12/+50
* | | | | Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano2013-06-3010-8/+439
|\ \ \ \ \
| * | | | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-1910-8/+439
* | | | | | Merge branch 'mh/loose-refs-race-with-pack-ref'Junio C Hamano2013-06-301-34/+72
|\ \ \ \ \ \
| * | | | | | resolve_ref_unsafe(): close race condition reading loose refsMichael Haggerty2013-06-191-4/+24
| * | | | | | resolve_ref_unsafe(): handle the case of an SHA-1 within loopMichael Haggerty2013-06-191-9/+13
| * | | | | | resolve_ref_unsafe(): extract function handle_missing_loose_ref()Michael Haggerty2013-06-191-21/+35
* | | | | | | Merge branch 'nk/name-rev-abbreviated-refs'Junio C Hamano2013-06-302-8/+31
|\ \ \ \ \ \ \
| * | | | | | | name-rev: allow to specify a subpath for --refs optionNamhyung Kim2013-06-182-8/+31
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-06-309-213/+673
|\ \ \ \ \ \ \
| * | | | | | | submodule: drop the top-level requirementJohn Keeping2013-06-176-35/+319
| * | | | | | | rev-parse: add --prefix optionJohn Keeping2013-06-173-5/+131
| * | | | | | | submodule: show full path in error messageJohn Keeping2013-06-171-1/+1
| * | | | | | | t7403: add missing && chainingJohn Keeping2013-06-171-2/+2
| * | | | | | | t7403: modernize styleJohn Keeping2013-06-171-133/+183
| * | | | | | | t7401: make indentation consistentJohn Keeping2013-06-171-40/+40
| |/ / / / / /
* | | | | | | Sync with 1.8.3.2Junio C Hamano2013-06-283-2/+8
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Git 1.8.3.2v1.8.3.2Junio C Hamano2013-06-283-2/+8
| * | | | | | configure: fix option help message for --disable-pthreadsStefano Lattarini2013-06-281-1/+1
| * | | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-286-38/+97
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2013-06-271-0/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Start preparing for 1.8.3.2Junio C Hamano2013-06-272-1/+55
| * | | | | | | Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2013-06-272-7/+21
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rr/push-head' into maintJunio C Hamano2013-06-271-7/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2013-06-272-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tg/maint-zsh-svn-remote-prompt' into maintJunio C Hamano2013-06-271-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maintJunio C Hamano2013-06-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/push-no-verify-doc' into maintJunio C Hamano2013-06-271-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-272-4/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2013-06-272-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \