Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t7600: fix typo in test titlemv/merge-ff-tristate | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
* | merge: handle --ff/--no-ff/--ff-only as a tri-state option | Miklos Vajna | 2013-07-02 | 2 | -25/+42 |
* | Merge branch 'maint' | Junio C Hamano | 2013-06-30 | 3 | -3/+14 |
|\ | |||||
| * | Start preparing for 1.8.3.3 | Junio C Hamano | 2013-06-30 | 2 | -1/+12 |
| * | Merge branch 'fc/macos-x-clipped-write' into maint | Junio C Hamano | 2013-06-30 | 4 | -0/+27 |
| |\ | |||||
| * \ | Merge branch 'da/darwin' into maint | Junio C Hamano | 2013-06-30 | 2 | -0/+25 |
| |\ \ | |||||
| * | | | check-ignore doc: fix broken link to ls-files page | Ramkumar Ramachandra | 2013-06-30 | 1 | -1/+1 |
| * | | | test: spell 'ls-files --delete' option correctly in test descriptions | SZEDER Gábor | 2013-06-30 | 1 | -2/+2 |
* | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-30 | 1 | -0/+23 |
* | | | | Merge branch 'mh/ref-races' | Junio C Hamano | 2013-06-30 | 6 | -134/+466 |
|\ \ \ \ | |||||
| * | | | | for_each_ref: load all loose refs before packed refs | Jeff King | 2013-06-20 | 1 | -4/+35 |
| * | | | | get_packed_ref_cache: reload packed-refs file when it changes | Jeff King | 2013-06-20 | 1 | -5/+16 |
| * | | | | add a stat_validity struct | Michael Haggerty | 2013-06-20 | 2 | -0/+57 |
| * | | | | Extract a struct stat_data from cache_entry | Michael Haggerty | 2013-06-20 | 3 | -80/+116 |
| * | | | | packed_ref_cache: increment refcount when locked | Michael Haggerty | 2013-06-20 | 1 | -1/+7 |
| * | | | | do_for_each_entry(): increment the packed refs cache refcount | Michael Haggerty | 2013-06-20 | 1 | -1/+4 |
| * | | | | refs: manage lifetime of packed refs cache via reference counting | Michael Haggerty | 2013-06-20 | 1 | -3/+36 |
| * | | | | refs: implement simple transactions for the packed-refs file | Michael Haggerty | 2013-06-20 | 3 | -21/+98 |
| * | | | | refs: wrap the packed refs cache in a level of indirection | Michael Haggerty | 2013-06-20 | 1 | -6/+26 |
| * | | | | pack_refs(): split creation of packed refs and entry writing | Michael Haggerty | 2013-06-20 | 1 | -14/+34 |
| * | | | | repack_without_ref(): split list curation and entry writing | Michael Haggerty | 2013-06-20 | 1 | -12/+50 |
* | | | | | Merge branch 'ap/diff-ignore-blank-lines' | Junio C Hamano | 2013-06-30 | 10 | -8/+439 |
|\ \ \ \ \ | |||||
| * | | | | | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-19 | 10 | -8/+439 |
* | | | | | | Merge branch 'mh/loose-refs-race-with-pack-ref' | Junio C Hamano | 2013-06-30 | 1 | -34/+72 |
|\ \ \ \ \ \ | |||||
| * | | | | | | resolve_ref_unsafe(): close race condition reading loose refs | Michael Haggerty | 2013-06-19 | 1 | -4/+24 |
| * | | | | | | resolve_ref_unsafe(): handle the case of an SHA-1 within loop | Michael Haggerty | 2013-06-19 | 1 | -9/+13 |
| * | | | | | | resolve_ref_unsafe(): extract function handle_missing_loose_ref() | Michael Haggerty | 2013-06-19 | 1 | -21/+35 |
* | | | | | | | Merge branch 'nk/name-rev-abbreviated-refs' | Junio C Hamano | 2013-06-30 | 2 | -8/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | name-rev: allow to specify a subpath for --refs option | Namhyung Kim | 2013-06-18 | 2 | -8/+31 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-06-30 | 9 | -213/+673 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule: drop the top-level requirement | John Keeping | 2013-06-17 | 6 | -35/+319 |
| * | | | | | | | rev-parse: add --prefix option | John Keeping | 2013-06-17 | 3 | -5/+131 |
| * | | | | | | | submodule: show full path in error message | John Keeping | 2013-06-17 | 1 | -1/+1 |
| * | | | | | | | t7403: add missing && chaining | John Keeping | 2013-06-17 | 1 | -2/+2 |
| * | | | | | | | t7403: modernize style | John Keeping | 2013-06-17 | 1 | -133/+183 |
| * | | | | | | | t7401: make indentation consistent | John Keeping | 2013-06-17 | 1 | -40/+40 |
| |/ / / / / / | |||||
* | | | | | | | Sync with 1.8.3.2 | Junio C Hamano | 2013-06-28 | 3 | -2/+8 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Git 1.8.3.2v1.8.3.2 | Junio C Hamano | 2013-06-28 | 3 | -2/+8 |
| * | | | | | | configure: fix option help message for --disable-pthreads | Stefano Lattarini | 2013-06-28 | 1 | -1/+1 |
| * | | | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint | Junio C Hamano | 2013-06-28 | 6 | -38/+97 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'maint' | Junio C Hamano | 2013-06-27 | 1 | -0/+54 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Start preparing for 1.8.3.2 | Junio C Hamano | 2013-06-27 | 2 | -1/+55 |
| * | | | | | | | Merge branch 'ks/difftool-dir-diff-copy-fix' into maint | Junio C Hamano | 2013-06-27 | 2 | -7/+21 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rr/push-head' into maint | Junio C Hamano | 2013-06-27 | 1 | -7/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'fc/show-branch-in-rebase-am' into maint | Junio C Hamano | 2013-06-27 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint | Junio C Hamano | 2013-06-27 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/push-no-verify-doc' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/commit-m-no-edit' into maint | Junio C Hamano | 2013-06-27 | 2 | -4/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/strbuf-branchname-fix' into maint | Junio C Hamano | 2013-06-27 | 2 | -4/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |