aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-10
* lockfile: add accessors get_lock_file_fd() and get_lock_file_fp()Michael Haggerty2015-08-10
* create_bundle(): duplicate file descriptor to avoid closing it twiceMichael Haggerty2015-08-10
* lockfile: move documentation to lockfile.h and lockfile.cMichael Haggerty2015-08-10
* Sync with 2.4.3Junio C Hamano2015-06-05
|\
| * Git 2.4.3v2.4.3Junio C Hamano2015-06-05
| * Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-05
| |\
| * \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-05
| |\ \
| * \ \ Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-05
| |\ \ \
| * \ \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-05
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | The first half of the seventh batch for 2.5Junio C Hamano2015-06-05
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-editor-multi-words'Junio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: tests: use test-chmtime in place of touchLuke Diamand2015-05-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: fix handling of multi-word P4EDITORLuke Diamand2015-05-24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add failing test for P4EDITOR handlingLuke Diamand2015-05-24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | struct ref_lock: convert old_sha1 member to object_idMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | warn_if_dangling_symref(): convert local variable "junk" to object_idMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | each_ref_fn_adapter(): remove adapterMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rev_list_insert_ref(): remove unneeded argumentsMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rev_list_insert_ref_oid(): new function, taking an object_oidMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete(): remove unneeded argumentsMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete_oid(): new function, taking an object_oidMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | clear_marks(): rewrite to take an object_id argumentMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete(): rewrite to take an object_id argumentMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | send_ref(): convert local variable "peeled" to object_idMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | upload-pack: rewrite functions to take object_id argumentsMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | find_symref(): convert local variable "unused" to object_idMichael Haggerty2015-05-25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | find_symref(): rewrite to take an object_id argumentMichael Haggerty2015-05-25