summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 2.2Junio C Hamano2014-10-141-0/+21
* Merge branch 'bc/asciidoc-pretty-formats-fix'Junio C Hamano2014-10-141-1/+1
|\
| * Documentation: fix misrender of pretty-formats in Asciidoctorbc/asciidoc-pretty-formats-fixbrian m. carlson2014-10-081-1/+1
* | Merge branch 'mh/lockfile-stdio'Junio C Hamano2014-10-141-11/+23
|\ \
| * | fdopen_lock_file(): access a lockfile using stdioMichael Haggerty2014-10-011-11/+23
* | | Merge branch 'mh/lockfile'Junio C Hamano2014-10-141-54/+188
|\ \ \ | |/ /
| * | get_locked_file_path(): new functionMichael Haggerty2014-10-011-0/+5
| * | lockfile: rename LOCK_NODEREF to LOCK_NO_DEREFMichael Haggerty2014-10-011-2/+2
| * | commit_lock_file_to(): refactor a helper out of commit_lock_file()Michael Haggerty2014-10-011-14/+20
| * | api-lockfile: document edge casesMichael Haggerty2014-10-011-6/+14
| * | close_lock_file(): if close fails, roll backMichael Haggerty2014-10-011-3/+4
| * | commit_lock_file(): die() if called for unlocked lockfile objectMichael Haggerty2014-10-011-1/+2
| * | api-lockfile: revise and expand the documentationMichael Haggerty2014-10-011-54/+167
* | | Merge branch 'so/rebase-doc-fork-point'Junio C Hamano2014-10-141-12/+19
|\ \ \
| * | | Documentation/git-rebase.txt: document when --fork-point is auto-enabledso/rebase-doc-fork-pointSergey Organov2014-09-291-12/+19
* | | | Update draft release notes to 2.2Junio C Hamano2014-10-081-0/+13
* | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-085-7/+148
|\ \ \ \
| * | | | signed push: allow stale nonce in stateless modeJunio C Hamano2014-09-172-0/+26
| * | | | signed push: fortify against replay attacksJunio C Hamano2014-09-174-9/+35
| * | | | signed push: add "pushee" header to push certificateJunio C Hamano2014-09-151-0/+6
| * | | | signed push: remove duplicated protocol infoJunio C Hamano2014-09-152-3/+42
| * | | | receive-pack: GPG-validate push certificatesJunio C Hamano2014-09-151-5/+19
| * | | | push: the beginning of "git push --signed"Junio C Hamano2014-09-153-2/+32
| * | | | pack-protocol doc: typofix for PKT-LINEJunio C Hamano2014-09-151-2/+2
* | | | | Sync with maintJunio C Hamano2014-10-071-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'maint-2.0' into maintJunio C Hamano2014-10-071-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-071-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-071-1/+1
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-071-1/+1
* | | | | | | Sync with 2.1.2Junio C Hamano2014-09-292-1/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Git 2.1.2v2.1.2Junio C Hamano2014-09-292-1/+22
| * | | | | | Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-291-1/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'so/rebase-doc' into maintJunio C Hamano2014-09-291-6/+3
| |\ \ \ \ \ \ \
* | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-09-291-0/+12
* | | | | | | | | Merge branch 'da/rev-parse-verify-quiet'Junio C Hamano2014-09-291-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: a note about stdout for git rev-parse --verify --quietDavid Aguilar2014-09-151-0/+1
* | | | | | | | | | Merge branch 'hj/pretty-naked-decoration'Junio C Hamano2014-09-291-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty: add %D format specifierhj/pretty-naked-decorationHarry Jeffery2014-09-181-2/+4
* | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-09-261-0/+21
* | | | | | | | | | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add macro REALLOC_ARRAYRené Scharfe2014-09-181-0/+3
* | | | | | | | | | | | Merge branch 'jk/close-stderr-of-credential-cache-deamon'Junio C Hamano2014-09-261-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | credential-cache: close stderr in daemon processjk/close-stderr-of-credential-cache-deamonJeff King2014-09-161-1/+5
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-09-191-12/+51
* | | | | | | | | | | | Sync with Git 2.1.1Junio C Hamano2014-09-192-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Git 2.1.1v2.1.1Junio C Hamano2014-09-192-1/+46
| * | | | | | | | | | | Merge branch 'sp/pack-protocol-doc-on-shallow' into maintJunio C Hamano2014-09-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/command-line-config-empty-string' into maintJunio C Hamano2014-09-191-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'so/rebase-doc'Junio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>so/rebase-docSergey Organov2014-09-161-1/+1