summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cygwin: Remove the Win32 l/stat() implementationrj/cygwin-clarify-use-of-cheating-lstatRamsay Jones2013-07-189-200/+2
* git-log.txt: fix typesetting of example "git-log -L" invocationEric Sunshine2013-07-171-1/+1
* Update draft release notes to 1.8.4Junio C Hamano2013-07-151-29/+29
* Sync with 1.8.3.3Junio C Hamano2013-07-152-1/+23
|\
| * Git 1.8.3.3v1.8.3.3Junio C Hamano2013-07-153-2/+24
| * Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-152-1/+15
| |\
| * \ Merge branch 'bc/http-keep-memory-given-to-curl' into maintJunio C Hamano2013-07-151-3/+9
| |\ \
| * \ \ Merge branch 'jk/pull-into-dirty-unborn' into maintJunio C Hamano2013-07-152-2/+38
| |\ \ \
| * \ \ \ Merge branch 'fg/submodule-non-ascii-path' into maintJunio C Hamano2013-07-152-1/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'fc/sequencer-plug-leak' into maintJunio C Hamano2013-07-151-7/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mt/send-email-cc-match-fix' into maintJunio C Hamano2013-07-152-9/+106
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'bc/send-email-use-port-as-separate-param'Junio C Hamano2013-07-151-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: provide port separately from hostnamebc/send-email-use-port-as-separate-parambrian m. carlson2013-07-041-2/+4
* | | | | | | | | Merge branch 'fg/submodule-clone-depth'Junio C Hamano2013-07-154-12/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add --depth to submodule update/addfg/submodule-clone-depthFredrik Gustafsson2013-07-034-12/+61
* | | | | | | | | | Merge branch 'cp/submodule-custom-update'Junio C Hamano2013-07-153-1/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule update: allow custom command to update submodule working treecp/submodule-custom-updateChris Packham2013-07-033-1/+38
* | | | | | | | | | | Merge branch 'jk/format-patch-from'Junio C Hamano2013-07-157-9/+145
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | teach format-patch to place other authors into in-body "From"Jeff King2013-07-037-0/+128
| * | | | | | | | | | | pretty.c: drop const-ness from pretty_print_contextJeff King2013-07-032-9/+17
* | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-152-25/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-022-25/+42
* | | | | | | | | | | | | Merge branch 'jk/fetch-pack-many-refs'Junio C Hamano2013-07-153-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fetch-pack: avoid quadratic behavior in rev_list_pushjk/fetch-pack-many-refsJeff King2013-07-021-7/+6
| * | | | | | | | | | | | | commit.c: make compare_commits_by_commit_date globalJeff King2013-07-022-1/+3
| * | | | | | | | | | | | | fetch-pack: avoid quadratic list insertion in mark_completeJeff King2013-07-021-1/+2
* | | | | | | | | | | | | | Update draft release notes for 1.8.4Junio C Hamano2013-07-121-0/+7
* | | | | | | | | | | | | | Merge branch 'jc/remote-http-argv-array'Junio C Hamano2013-07-121-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote-http: use argv-arrayjc/remote-http-argv-arrayJunio C Hamano2013-07-091-16/+16
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/pickaxe-simplify'Junio C Hamano2013-07-121-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diffcore-pickaxe: simplify has_changes and containsrs/pickaxe-simplifyRené Scharfe2013-07-071-7/+4
* | | | | | | | | | | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell'Junio C Hamano2013-07-122-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test-lint: detect 'export FOO=bar'Thomas Rast2013-07-081-0/+1
| * | | | | | | | | | | | | | | t9902: fix 'test A == B' to use = operatorThomas Rast2013-07-081-1/+1
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rr/name-rev-stdin-doc'Junio C Hamano2013-07-121-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | name-rev doc: rewrite --stdin paragraphRamkumar Ramachandra2013-07-071-2/+4
* | | | | | | | | | | | | | | | Merge branch 'ft/diff-rename-default-score-is-half'Junio C Hamano2013-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff-options: document default similarity indexFraser Tweedale2013-07-051-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'ml/cygwin-does-not-have-fifo'Junio C Hamano2013-07-121-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | test-lib.sh - cygwin does not have usable FIFOsml/cygwin-does-not-have-fifoMark Levedahl2013-07-051-1/+8
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tf/gitweb-extra-breadcrumbs'Junio C Hamano2013-07-122-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gitweb: allow extra breadcrumbs to prefix the trailtf/gitweb-extra-breadcrumbsTony Finch2013-07-042-3/+26
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-126-14/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-036-14/+17
* | | | | | | | | | | | | | | | | | Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-123-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | pull: change the description to "integrate" changesjk/pull-to-integrateJohn Keeping2013-07-082-2/+2
| * | | | | | | | | | | | | | | | | | push: avoid suggesting "merging" remote changesJohn Keeping2013-07-071-6/+6
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-config-multi-order'Junio C Hamano2013-07-121-8/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-config(1): clarify precedence of multiple valuesjk/maint-config-multi-orderJohn Keeping2013-07-071-8/+12
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-129-136/+265
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \