summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/avoid-rewriting-packed-refs' into maintJunio C Hamano2017-12-064-1/+238
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/ssh-wrappers'Junio C Hamano2017-12-064-152/+266
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | connect: correct style of C-style commentjn/ssh-wrappersJonathan Nieder2017-11-211-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | ssh: 'simple' variant does not support --portJonathan Nieder2017-11-213-5/+22
| * | | | | | | | | | | | | | | | | | | | | | | ssh: 'simple' variant does not support -4/-6Jonathan Nieder2017-11-212-9/+28
| * | | | | | | | | | | | | | | | | | | | | | | ssh: 'auto' variant to select between 'ssh' and 'simple'Jonathan Nieder2017-11-213-17/+62
| * | | | | | | | | | | | | | | | | | | | | | | connect: split ssh option computation to its own functionJonathan Nieder2017-11-211-28/+37
| * | | | | | | | | | | | | | | | | | | | | | | connect: split ssh command line options into separate functionJonathan Nieder2017-11-211-53/+60
| * | | | | | | | | | | | | | | | | | | | | | | connect: split git:// setup into a separate functionJonathan Nieder2017-11-211-44/+59
| * | | | | | | | | | | | | | | | | | | | | | | connect: move no_fork fallback to git_tcp_connectJonathan Nieder2017-11-211-15/+21
| * | | | | | | | | | | | | | | | | | | | | | | ssh test: make copy_ssh_wrapper_as clean up after itselfJonathan Nieder2017-11-211-16/+12
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/protocol-v1'Junio C Hamano2017-12-0619-149/+968
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: document Extra ParametersJonathan Tan2017-10-172-7/+44
| * | | | | | | | | | | | | | | | | | | | | | | ssh: introduce a 'simple' ssh variantBrandon Williams2017-10-175-61/+111
| * | | | | | | | | | | | | | | | | | | | | | | i5700: add interop test for protocol transitionBrandon Williams2017-10-171-0/+68
| * | | | | | | | | | | | | | | | | | | | | | | http: tell server that the client understands v1Brandon Williams2017-10-174-0/+96
| * | | | | | | | | | | | | | | | | | | | | | | connect: tell server that the client understands v1Brandon Williams2017-10-172-5/+255
| * | | | | | | | | | | | | | | | | | | | | | | connect: teach client to recognize v1 server responseBrandon Williams2017-10-171-4/+26
| * | | | | | | | | | | | | | | | | | | | | | | upload-pack, receive-pack: introduce protocol version 1Brandon Williams2017-10-172-1/+36
| * | | | | | | | | | | | | | | | | | | | | | | daemon: recognize hidden request argumentsBrandon Williams2017-10-171-9/+62
| * | | | | | | | | | | | | | | | | | | | | | | protocol: introduce protocol extension mechanismsBrandon Williams2017-10-176-0/+144
| * | | | | | | | | | | | | | | | | | | | | | | pkt-line: add packet_write functionBrandon Williams2017-10-172-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | connect: in ref advertisement, shallows are lastJonathan Tan2017-09-271-66/+123
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sp/doc-info-attributes'Junio C Hamano2017-12-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | doc: Mention info/attributes in gitrepository-layoutsp/doc-info-attributesSteffen Prohaska2017-11-241-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/stash-save-m-option-fix'Junio C Hamano2017-12-062-0/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | stash: learn to parse -m/--message like commit doesph/stash-save-m-option-fixPhil Hord2017-11-242-0/+111
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fewer-pack-rescan'Junio C Hamano2017-12-065-24/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: fast-path null sha1 as a missing objectjk/fewer-pack-rescanJeff King2017-11-221-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | everything_local: use "quick" object existence checkJeff King2017-11-211-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | p5551: add a script to test fetch pack-dir rescansJeff King2017-11-211-0/+55
| * | | | | | | | | | | | | | | | | | | | | | | | | t/perf/lib-pack: use fast-import checkpoint to create packsJeff King2017-11-211-7/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | p5550: factor out nonsense-pack creationJeff King2017-11-212-23/+31
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tg/deprecate-stash-save'Junio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | doc: prefer 'stash push' over 'stash save'tg/deprecate-stash-savePhil Hord2017-11-221-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/doc-notes-prune-fix'Junio C Hamano2017-12-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | notes: correct 'git notes prune' options to '[-n] [-v]'rd/doc-notes-prune-fixRobert P. J. Day2017-11-222-2/+2
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/man-reflog-add-n'Junio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | doc: add missing "-n" (dry-run) option to reflog man pagerd/man-reflog-add-npd/man-reflog-add-nRobert P. J. Day2017-11-221-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/man-prune-progress'Junio C Hamano2017-12-062-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | prune: add "--progress" to man page and usage msgrd/man-prune-progresspd/man-prune-progressRobert P. J. Day2017-11-222-4/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/submodule-tests-cleanup'Junio C Hamano2017-12-061-218/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Tests: clean up submodule recursive helpersjt/submodule-tests-cleanupJonathan Tan2017-11-221-218/+125
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/reproducible-build'Junio C Hamano2017-12-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-buildjn/reproducible-buildJunio C Hamano2017-11-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: sort entries in optimized tclIndexAnders Kaseorg2017-11-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | generate-cmdlist: avoid non-deterministic outputJonathan Nieder2017-11-221-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/git-packet-pm'Junio C Hamano2017-12-062-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Git/Packet.pm: use 'if' instead of 'unless'cc/git-packet-pmChristian Couder2017-11-221-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Git/Packet: clarify that packet_required_key_val_read allows EOFChristian Couder2017-11-222-4/+9