summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* status: respect "-b" for porcelain formatJeff King2012-05-085-11/+16
* status: fix null termination with "-b"Jeff King2012-05-082-3/+13
* status: refactor null_termination optionJeff King2012-05-083-24/+24
* commit: refactor option parsingJeff King2012-05-081-58/+59
* Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-035-71/+276
|\
| * fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-182-10/+149
| * builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-174-28/+43
| * builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
| * merge tests: octopus with redundant parentsMichaƂ Kiedrowicz2012-04-173-7/+39
* | Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-033-11/+19
|\ \
| * | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-153-11/+19
* | | Merge branch 'cb/http-multi-curl-auth' into maintJunio C Hamano2012-05-032-10/+26
|\ \ \
| * | | http: use newer curl options for setting credentialsJeff King2012-04-141-2/+11
| * | | http: clean up leak in init_curl_http_authJeff King2012-04-141-3/+3
| * | | fix http auth with multiple curl handlesJeff King2012-04-102-5/+7
| * | | http auth fails with multiple curl handlesClemens Buchacher2012-04-101-10/+15
| |/ /
* | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-032-4/+43
|\ \ \
| * | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-172-3/+41
| * | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-171-1/+2
| | |/ | |/|
* | | Merge branch 'rl/maint-stash-i18n-save-error' into maintJunio C Hamano2012-05-031-2/+2
|\ \ \
| * | | stash: use eval_gettextln correctlyRoss Lagerwall2012-04-141-2/+2
| |/ /
* | | Merge branch 'jm/maint-strncpy-diff-no-index' into maintJunio C Hamano2012-05-031-21/+17
|\ \ \
| * | | diff --no-index: use strbuf for temporary pathnamesJunio C Hamano2012-04-261-23/+17
| * | | diff: avoid stack-buffer-read-overrun for very long nameJim Meyering2012-04-161-0/+2
| |/ /
* | | Git 1.7.10.1v1.7.10.1Junio C Hamano2012-05-013-3/+32
* | | Merge branch 'pw/fast-import-dataref-parsing' into maintJunio C Hamano2012-05-012-33/+364
|\ \ \
| * | | fast-import: tighten parsing of datarefsPete Wyckoff2012-04-102-33/+364
* | | | Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-016-6/+162
|\ \ \ \
| * | | | remote-curl: main test case for the OS command line overflowIvan Todoroski2012-04-101-0/+31
| * | | | fetch-pack: test cases for the new --stdin optionIvan Todoroski2012-04-101-0/+66
| * | | | remote-curl: send the refs to fetch-pack on stdinIvan Todoroski2012-04-101-5/+13
| * | | | fetch-pack: new --stdin option to read refs from stdinIvan Todoroski2012-04-023-1/+52
* | | | | Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-011-3/+3
|\ \ \ \ \
| * | | | | submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann2012-04-141-3/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-011-0/+1
|\ \ \ \ \
| * | | | | blame: accept --need-minimalJunio C Hamano2012-04-111-0/+1
* | | | | | Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano2012-05-013-2/+299
|\ \ \ \ \ \
| * | | | | | t4202: add test for "log --graph --stat -p" separator lineslp/maint-diff-three-dash-with-graphLucian Poston2012-03-201-0/+290
| * | | | | | log --graph: fix break in graph linesLucian Poston2012-03-201-0/+6
| * | | | | | log --graph --stat: three-dash separator should come after graph linesLucian Poston2012-03-201-2/+3
* | | | | | | Merge branch 'jk/rebase-i-submodule-conflict-only' into maintJunio C Hamano2012-05-012-1/+31
|\ \ \ \ \ \ \
| * | | | | | | rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-092-1/+31
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'maint' of https://github.com/git-l10n/git-poJunio C Hamano2012-05-016-282/+7605
|\ \ \ \ \ \ \
| * | | | | | | l10n: Initial German translationRalf Thielow2012-05-011-717/+984
| * | | | | | | l10n: Update Simplified Chinese translationJiang Xin2012-04-281-84/+100
| * | | | | | | l10n: Update git.pot (2 new messages)Jiang Xin2012-04-281-83/+96
| * | | | | | | Merge maint branch for tracking l10n updates of git stable versionJiang Xin2012-04-2840-213/+779
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Start preparing for 1.7.10.1Junio C Hamano2012-04-262-1/+51
* | | | | | | | Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-266-7/+86
|\ \ \ \ \ \ \ \