| a155a5f | Junio C Hamano | 03 December 2013, 19:16:56 UTC | Git 1.8.5.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2013, 19:16:56 UTC |
| 2951add | Nick Townsend | 25 November 2013, 23:31:09 UTC | ref-iteration doc: add_submodule_odb() returns 0 for success The usage sample of add_submodule_odb() function in the Submodules section expects non-zero return value for success, but the function actually reports success with zero. Helped-by: René Scharfe <l.s.r@web.de> Reviewed-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Nick Townsend <nick.townsend@mac.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2013, 18:40:40 UTC |
| be38bee | Junio C Hamano | 02 December 2013, 23:34:44 UTC | Sync with 1.8.4.5 | 02 December 2013, 23:34:44 UTC |
| 2f93541 | Junio C Hamano | 02 December 2013, 23:33:30 UTC | Git 1.8.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2013, 23:33:30 UTC |
| ac1fbbd | Junio C Hamano | 02 December 2013, 21:31:55 UTC | submodule: do not copy unknown update mode from .gitmodules When submodule.$name.update is given as hint from the upstream in the .gitmodules file, we used to blindly copy it to .git/config, unless there already is a value defined for the submodule. However, there is no reason to expect that the update mode hinted by the upstream is available in the version of Git the user is using, and a really custom "!cmd" prepared by an upstream person running on Linux may not even be available to a user on Windows. It is simply irresponsible to copy the setting blindly and to attempt to use it during a later "submodule update" without validating it first. Just show the suggested value to the diagnostic output, and set the value to 'none' in the configuration, if it is not one of the ones that are known to be supported by this version of Git. Helped-by: Jens Lehmann <Jens.Lehmann@web.de> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2013, 21:48:06 UTC |
| d2446df | Junio C Hamano | 27 November 2013, 20:14:45 UTC | Git 1.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2013, 20:14:45 UTC |
| 4a3fc52 | Junio C Hamano | 27 November 2013, 20:13:29 UTC | Sync with maint * maint: remote-hg: don't decode UTF-8 paths into Unicode objects | 27 November 2013, 20:13:29 UTC |
| 5c1d2e8 | Richard Hansen | 18 November 2013, 04:12:42 UTC | remote-hg: don't decode UTF-8 paths into Unicode objects The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again. Signed-off-by: Richard Hansen <rhansen@bbn.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2013, 20:09:50 UTC |
| c302941 | Junio C Hamano | 25 November 2013, 16:20:02 UTC | Merge branch 'rh/remote-hg-bzr-updates' (early part) Unbreaks a recent breakage due to use of unquote-c-style. This may need to be cherry-picked down to 1.8.4.x series. * 'rh/remote-hg-bzr-updates' (early part): remote-hg: don't decode UTF-8 paths into Unicode objects | 25 November 2013, 16:20:02 UTC |
| 5fd09df | Junio C Hamano | 20 November 2013, 19:18:25 UTC | Git 1.8.5-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2013, 19:27:26 UTC |
| 039a6d2 | Junio C Hamano | 20 November 2013, 19:26:59 UTC | Sync with 1.8.4.4 | 20 November 2013, 19:26:59 UTC |
| becb433 | Junio C Hamano | 20 November 2013, 19:26:08 UTC | Git 1.8.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2013, 19:26:08 UTC |
| a39afc0 | Junio C Hamano | 20 November 2013, 19:15:25 UTC | Merge branch 'mb/relnotes-1.8.5-fix' * mb/relnotes-1.8.5-fix: RelNotes: spelling & grammar fixes | 20 November 2013, 19:15:25 UTC |
| 569fb49 | Marc Branchaud | 14 November 2013, 17:01:13 UTC | RelNotes: spelling & grammar fixes Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2013, 22:35:55 UTC |
| c6f1b92 | Junio C Hamano | 18 November 2013, 22:31:29 UTC | Merge branch 'nd/literal-pathspecs' Fixes a regression on 'master' since v1.8.4. * nd/literal-pathspecs: pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses | 18 November 2013, 22:31:29 UTC |
| c939d24 | Richard Hansen | 18 November 2013, 04:12:42 UTC | remote-hg: don't decode UTF-8 paths into Unicode objects The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again. Signed-off-by: Richard Hansen <rhansen@bbn.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2013, 21:45:56 UTC |
| 33da0c9 | Junio C Hamano | 18 November 2013, 20:25:28 UTC | Merge branch 'maint' Hotfix for recent regression while talking to upload-pack in a repository with many symbolic refs. * maint: Revert "upload-pack: send non-HEAD symbolic refs" | 18 November 2013, 20:25:28 UTC |
| ab930f0 | Junio C Hamano | 18 November 2013, 20:24:49 UTC | Merge branch 'jx/branch-vv-always-compare-with-upstream' Hot-fix for a regression. * jx/branch-vv-always-compare-with-upstream: branch: fix --verbose output column alignment | 18 November 2013, 20:24:49 UTC |
| 6b364d4 | Torstein Hegge | 14 November 2013, 18:18:01 UTC | branch: fix --verbose output column alignment Commit f2e0873 (branch: report invalid tracking branch as gone) removed an early return from fill_tracking_info() in the path taken when 'git branch -v' lists a branch in sync with its upstream. This resulted in an unconditionally added space in front of the subject line: $ git branch -v * master f5eb3da commit pushed to upstream topic f935eb6 unpublished topic Instead, only add the trailing space if a decoration have been added. To catch this kind of whitespace breakage in the tests, be a bit less smart when filtering the output through sed. Signed-off-by: Torstein Hegge <hegge@resisty.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2013, 19:24:08 UTC |
| d007dbf | Junio C Hamano | 18 November 2013, 18:15:45 UTC | Revert "upload-pack: send non-HEAD symbolic refs" This reverts commit 5e7dcad771cb873e278a0571b46910d7c32e2f6c; there may be unbounded number of symbolic refs in the repository, but the capability header line in the on-wire protocol has a rather low length limit. | 18 November 2013, 18:15:45 UTC |
| 0397305 | Junio C Hamano | 13 November 2013, 20:59:31 UTC | Git 1.8.5-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2013, 20:59:31 UTC |
| 7061504 | Junio C Hamano | 12 November 2013, 19:26:11 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: de.po: improve error message when pushing to unknown upstream l10n: de.po: translate 68 new messages po/TEAMS: update Thomas Rast's email address l10n: Update Swedish translation (2194t0f0u) l10n: fr.po 2194/1294 messages translated l10n: zh_CN.po: translate 68 messages (2194t0f0u) l10n: vi.po (2194t): Update and minor fix l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed) | 12 November 2013, 19:26:11 UTC |
| 0ffa154 | Jason St. John | 09 November 2013, 00:48:52 UTC | Correct word usage of "timezone" in "Documentation" directory "timezone" is two words, not one (i.e. "time zone" is correct). Correct this in these files: -- date-formats.txt -- git-blame.txt -- git-cvsimport.txt -- git-fast-import.txt -- git-svn.txt -- gitweb.conf.txt -- rev-list-options.txt Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 November 2013, 18:47:17 UTC |
| 1f6fb7f | Ralf Thielow | 08 November 2013, 19:34:35 UTC | l10n: de.po: improve error message when pushing to unknown upstream Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Thomas Rast <tr@thomasrast.ch> | 12 November 2013, 05:31:15 UTC |
| 1d38363 | Ralf Thielow | 02 November 2013, 17:58:52 UTC | l10n: de.po: translate 68 new messages Translate 68 new messages came from git.pot update in 727b957 (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Thomas Rast <tr@thomasrast.ch> | 12 November 2013, 05:31:15 UTC |
| 1b12df5 | Ralf Thielow | 02 November 2013, 17:56:14 UTC | po/TEAMS: update Thomas Rast's email address Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Thomas Rast <tr@thomasrast.ch> | 12 November 2013, 05:31:15 UTC |
| 86fe7c0 | Jiang Xin | 10 November 2013, 00:48:23 UTC | Merge remote-tracking branch 'sv/nafmo/master' * sv/nafmo/master: l10n: Update Swedish translation (2194t0f0u) | 10 November 2013, 00:48:23 UTC |
| 1f32de1 | Peter Krefting | 02 July 2013, 12:09:37 UTC | l10n: Update Swedish translation (2194t0f0u) And fix a typo. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 09 November 2013, 18:08:23 UTC |
| eadd122 | Jean-Noel Avila | 01 November 2013, 14:35:08 UTC | l10n: fr.po 2194/1294 messages translated Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Sebastien Helleu <flashcode@flashtux.org> | 08 November 2013, 22:27:57 UTC |
| 0ecd94d | Junio C Hamano | 08 November 2013, 20:08:43 UTC | Sync with 1.8.4.3 | 08 November 2013, 20:08:43 UTC |
| d7d2c87 | Junio C Hamano | 08 November 2013, 20:06:19 UTC | Git 1.8.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2013, 20:06:19 UTC |
| cdc0c0f | Junio C Hamano | 08 November 2013, 20:01:58 UTC | Merge branch 'jn/test-prereq-perl-doc' into maint The interaction between use of Perl in our test suite and NO_PERL has been clarified a bit. * jn/test-prereq-perl-doc: t/README: tests can use perl even with NO_PERL | 08 November 2013, 20:01:58 UTC |
| 4bc3d3f | Junio C Hamano | 08 November 2013, 20:01:13 UTC | Merge branch 'ap/remote-hg-unquote-cquote' into maint A fast-import stream expresses a pathname with funny characters by quoting them in C style; remote-hg remote helper (in contrib/) forgot to unquote such a path. * ap/remote-hg-unquote-cquote: remote-hg: unquote C-style paths when exporting | 08 November 2013, 20:01:14 UTC |
| 9196a2f | Junio C Hamano | 08 November 2013, 19:38:00 UTC | Merge branch 'jc/upload-pack-send-symref' into maint One long-standing flaw in the pack transfer protocol used by "git clone" was that there was no way to tell the other end which branch "HEAD" points at, and the receiving end needed to guess. A new capability has been defined in the pack protocol to convey this information so that cloning from a repository with more than one branches pointing at the same commit where the HEAD is at now reliably sets the initial branch in the resulting repository. * jc/upload-pack-send-symref: t5570: Update for clone-progress-to-stderr branch t5570: Update for symref capability clone: test the new HEAD detection logic connect: annotate refs with their symref information in get_remote_head() connect.c: make parse_feature_value() static upload-pack: send non-HEAD symbolic refs upload-pack: send symbolic ref information as capability upload-pack.c: do not pass confusing cb_data to mark_our_ref() t5505: fix "set-head --auto with ambiguous HEAD" test | 08 November 2013, 19:38:00 UTC |
| e5becd0 | Junio C Hamano | 08 November 2013, 19:37:25 UTC | Merge branch 'jk/http-auth-redirects' into maint We did not handle cases where http transport gets redirected during the authorization request (e.g. from http:// to https://). * jk/http-auth-redirects: http.c: Spell the null pointer as NULL remote-curl: rewrite base url from info/refs redirects remote-curl: store url as a strbuf remote-curl: make refs_url a strbuf http: update base URLs when we see redirects http: provide effective url to callers http: hoist credential request out of handle_curl_result http: refactor options to http_get_* http_request: factor out curlinfo_strbuf http_get_file: style fixes | 08 November 2013, 19:37:26 UTC |
| 867b1c1 | Junio C Hamano | 07 November 2013, 22:41:25 UTC | Sync with maint * maint: Start preparing for 1.8.4.3 gitignore.txt: fix documentation of "**" patterns | 07 November 2013, 22:41:25 UTC |
| 486b65a | Junio C Hamano | 07 November 2013, 22:39:47 UTC | Start preparing for 1.8.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 November 2013, 22:39:47 UTC |
| 8edf8c0 | Junio C Hamano | 07 November 2013, 22:37:39 UTC | Merge branch 'sc/doc-howto-dumb-http' into maint An ancient How-To on serving Git repositories on an HTTP server lacked a warning that it has been mostly superseded with more modern way. * sc/doc-howto-dumb-http: doc/howto: warn about (dumb)http server document being too old | 07 November 2013, 22:37:39 UTC |
| 5022b58 | Junio C Hamano | 07 November 2013, 22:37:35 UTC | Merge branch 'vd/doc-unpack-objects' into maint The synopsis section of "git unpack-objects" documentation has been clarified a bit. * vd/doc-unpack-objects: Documentation: "pack-file" is not literal in unpack-objects Documentation: restore a space in unpack-objects usage | 07 November 2013, 22:37:36 UTC |
| 4ccf2f5 | Junio C Hamano | 07 November 2013, 22:37:17 UTC | Merge branch 'jk/subtree-install-fix' into maint We did not generate HTML version of documentation to "git subtree" in contrib/. * jk/subtree-install-fix: subtree: add makefile target for html docs | 07 November 2013, 22:37:17 UTC |
| 46992b5 | Junio C Hamano | 07 November 2013, 22:37:11 UTC | Merge branch 'hn/log-graph-color-octopus' into maint Coloring around octopus merges in "log --graph" output was screwy. * hn/log-graph-color-octopus: graph: fix coloring around octopus merges | 07 November 2013, 22:37:11 UTC |
| 07c55c0 | Junio C Hamano | 07 November 2013, 22:36:59 UTC | Merge branch 'mm/checkout-auto-track-fix' into maint "git checkout topic", when there is not yet a local "topic" branch but there is a unique remote-tracking branch for a remote "topic" branch, pretended as if "git checkout -t -b topic remote/$r/topic" (for that unique remote $r) was run. This hack however was not implemented for "git checkout topic --". * mm/checkout-auto-track-fix: checkout: proper error message on 'git checkout foo bar --' checkout: allow dwim for branch creation for "git checkout $branch --" | 07 November 2013, 22:36:59 UTC |
| 9ad3f74 | Junio C Hamano | 07 November 2013, 22:36:45 UTC | Merge branch 'sg/prompt-svn-remote-fix' into maint Bash prompting code to deal with an SVN remote as an upstream were coded in a way not supported by older Bash versions (3.x). * sg/prompt-svn-remote-fix: bash prompt: don't use '+=' operator in show upstream code path | 07 November 2013, 22:36:45 UTC |
| 0ceb753 | Junio C Hamano | 07 November 2013, 22:34:51 UTC | Merge branch 'jk/split-broken-ident' into maint The fall-back parsing of commit objects with broken author or committer lines were less robust than ideal in picking up the timestamps. * jk/split-broken-ident: split_ident: parse timestamp from end of line | 07 November 2013, 22:34:51 UTC |
| 0faff47 | Junio C Hamano | 07 November 2013, 22:34:14 UTC | Merge branch 'jc/revision-range-unpeel' into maint "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the output, but "git rev-list --objects v1.0^..v1.0" did not. * jc/revision-range-unpeel: revision: do not peel tags used in range notation | 07 November 2013, 22:34:14 UTC |
| 8447dc8 | Karsten Blees | 07 November 2013, 16:30:47 UTC | gitignore.txt: fix documentation of "**" patterns "**" means bold in ASCIIDOC, so we need to escape it. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 November 2013, 18:49:52 UTC |
| 6ba01ba | Junio C Hamano | 06 November 2013, 22:35:19 UTC | Git 1.8.5-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2013, 22:35:19 UTC |
| 152a9c1 | Junio C Hamano | 06 November 2013, 22:34:43 UTC | Merge branch 'fc/trivial' A random collection of style fixes and minor doc updates. * fc/trivial: setup: trivial style fixes run-command: trivial style fixes diff: trivial style fix revision: trivial style fixes pretty: trivial style fix describe: trivial style fixes transport-helper: trivial style fix sha1-name: trivial style cleanup branch: trivial style fix revision: add missing include doc/pull: clarify the illustrations t: replace pulls with merges merge: simplify ff-only option | 06 November 2013, 22:34:43 UTC |
| f26f72d | Junio C Hamano | 04 November 2013, 23:05:08 UTC | Update draft release notes to 1.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2013, 23:05:08 UTC |
| 944adac | Junio C Hamano | 04 November 2013, 22:58:19 UTC | Merge branch 'bw/solaris-sed-tr-test-portability' * bw/solaris-sed-tr-test-portability: t4015: simplify sed command that is not even seen by sed Avoid difference in tr semantics between System V and BSD Change sed i\ usage to something Solaris' sed can handle | 04 November 2013, 22:58:20 UTC |
| ea06592 | Junio C Hamano | 04 November 2013, 22:58:15 UTC | Merge branch 'vd/doc-unpack-objects' * vd/doc-unpack-objects: Documentation: "pack-file" is not literal in unpack-objects Documentation: restore a space in unpack-objects usage | 04 November 2013, 22:58:16 UTC |
| d35a42a | Junio C Hamano | 04 November 2013, 22:58:10 UTC | Merge branch 'jk/duplicate-objects-in-packs' Test fixup to a topic recently graduated. * jk/duplicate-objects-in-packs: Fix '\%o' for printf from coreutils | 04 November 2013, 22:58:10 UTC |
| 59c21d1 | Junio C Hamano | 04 November 2013, 22:58:08 UTC | Merge branch 'jk/subtree-install-fix' * jk/subtree-install-fix: subtree: add makefile target for html docs | 04 November 2013, 22:58:08 UTC |
| ec787db | Junio C Hamano | 04 November 2013, 22:58:05 UTC | Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys' * ak/cvsserver-stabilize-use-of-hash-keys: cvsserver: Determinize output to combat Perl 5.18 hash randomization | 04 November 2013, 22:58:05 UTC |
| a3a9cff | Junio C Hamano | 04 November 2013, 22:58:01 UTC | Merge branch 'jk/wrap-perl-used-in-tests' * jk/wrap-perl-used-in-tests: t: use perl instead of "$PERL_PATH" where applicable t: provide a perl() function which uses $PERL_PATH | 04 November 2013, 22:58:02 UTC |
| 68d5fbe | Junio C Hamano | 04 November 2013, 22:57:57 UTC | Merge branch 'sc/doc-howto-dumb-http' * sc/doc-howto-dumb-http: doc/howto: warn about (dumb)http server document being too old | 04 November 2013, 22:57:57 UTC |
| 46466ea | Junio C Hamano | 04 November 2013, 22:57:53 UTC | Merge branch 'jn/test-prereq-perl-doc' * jn/test-prereq-perl-doc: t/README: tests can use perl even with NO_PERL | 04 November 2013, 22:57:53 UTC |
| 05e9d90 | Junio C Hamano | 04 November 2013, 18:11:15 UTC | t4015: simplify sed command that is not even seen by sed Noticed by Andreas Schwab; \<LF> inside a double quotes pair is eaten by the shell to become an empty string and is not doing anything. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2013, 18:11:15 UTC |
| 9031479 | Jiang Xin | 17 September 2013, 15:37:05 UTC | l10n: zh_CN.po: translate 68 messages (2194t0f0u) Translate 68 new messages came from git.pot update in 727b957 (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 03 November 2013, 06:09:08 UTC |
| 44bb936 | Tran Ngoc Quan | 02 November 2013, 06:21:55 UTC | l10n: vi.po (2194t): Update and minor fix Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 02 November 2013, 06:21:55 UTC |
| 727b957 | Jiang Xin | 02 November 2013, 00:08:26 UTC | l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed) Generate po/git.pot from v1.8.5-rc0-23-gaa27064 for git v1.8.5 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 02 November 2013, 00:08:26 UTC |
| 61e2e22 | Vivien Didelot | 01 November 2013, 15:42:43 UTC | Documentation: "pack-file" is not literal in unpack-objects Make it clear that "pack-file" is not to be spelled as is in the unpack-objects usage. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2013, 16:13:35 UTC |
| aa27064 | Junio C Hamano | 01 November 2013, 15:14:52 UTC | Update draft release notes to 1.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2013, 15:14:52 UTC |
| e0fd1e3 | Junio C Hamano | 01 November 2013, 14:38:58 UTC | Merge branch 'sb/refs-code-cleanup' * sb/refs-code-cleanup: cache: remove unused function 'have_git_dir' refs: remove unused function invalidate_ref_cache | 01 November 2013, 14:38:58 UTC |
| c9bb7d0 | Junio C Hamano | 01 November 2013, 14:38:56 UTC | Merge branch 'rs/web-browse-xdg-open' * rs/web-browse-xdg-open: web--browse: Add support for xdg-open | 01 November 2013, 14:38:56 UTC |
| fbaa226 | Junio C Hamano | 01 November 2013, 14:38:54 UTC | Merge branch 'js/tests-windows-port-fix' * js/tests-windows-port-fix: tests: undo special treatment of CRLF for Windows Windows: a test_cmp that is agnostic to random LF <> CRLF conversions t5300-pack-object: do not compare binary data using test_cmp | 01 November 2013, 14:38:54 UTC |
| cbe59df | Junio C Hamano | 01 November 2013, 14:38:51 UTC | Merge branch 'js/test-help-format-windows-port-fix' * js/test-help-format-windows-port-fix: t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html | 01 November 2013, 14:38:51 UTC |
| 1feb458 | Junio C Hamano | 01 November 2013, 14:38:49 UTC | Merge branch 'jk/reset-p-current-head-fix' "git reset -p HEAD" has codepath to special case it from resetting to contents of other commits, but recent change broke it. * jk/reset-p-current-head-fix: reset: pass real rev name to add--interactive add-interactive: handle unborn branch in patch mode | 01 November 2013, 14:38:49 UTC |
| 60e779a | Junio C Hamano | 01 November 2013, 14:38:46 UTC | Merge branch 'jk/pack-corruption-post-mortem' * jk/pack-corruption-post-mortem: howto: add article on recovering a corrupted object | 01 November 2013, 14:38:46 UTC |
| c167b76 | Junio C Hamano | 01 November 2013, 14:38:41 UTC | Merge branch 'jk/for-each-ref-skip-parsing' * jk/for-each-ref-skip-parsing: for-each-ref: avoid loading objects to print %(objectname) | 01 November 2013, 14:38:41 UTC |
| 583736c | Junio C Hamano | 01 November 2013, 14:38:35 UTC | Merge branch 'ap/remote-hg-unquote-cquote' A fast-import stream expresses a pathname with funny characters by quoting them in C style; remote-hg remote helper forgot to unquote such a path. * ap/remote-hg-unquote-cquote: remote-hg: unquote C-style paths when exporting | 01 November 2013, 14:38:35 UTC |
| 9dd860c | Junio C Hamano | 01 November 2013, 14:38:26 UTC | Merge branch 'jl/submodule-mv' Moving a regular file in a repository with a .gitmodules file was producing a warning 'Could not find section in .gitmodules where path=<filename>'. * jl/submodule-mv: mv: Fix spurious warning when moving a file in presence of submodules | 01 November 2013, 14:38:27 UTC |
| 7242498 | Vivien Didelot | 31 October 2013, 21:41:11 UTC | Documentation: restore a space in unpack-objects usage The commit 87b7b84 removed a space in the unpack-objects usage, which makes the synopsis a bit confusing. This patch simply restores it. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 22:11:28 UTC |
| abf03ee | Felipe Contreras | 31 October 2013, 09:25:46 UTC | setup: trivial style fixes Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:48:32 UTC |
| 5a50085 | Felipe Contreras | 31 October 2013, 09:25:45 UTC | run-command: trivial style fixes Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:48:26 UTC |
| 4e7e4b6 | Felipe Contreras | 31 October 2013, 09:25:44 UTC | diff: trivial style fix Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:48:09 UTC |
| 9e57ac5 | Felipe Contreras | 31 October 2013, 09:25:43 UTC | revision: trivial style fixes Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:48:05 UTC |
| 35b2fa5 | Felipe Contreras | 31 October 2013, 09:25:42 UTC | pretty: trivial style fix Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:47:41 UTC |
| c447264 | Felipe Contreras | 31 October 2013, 09:25:41 UTC | describe: trivial style fixes Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:47:35 UTC |
| 23cd01e | Felipe Contreras | 31 October 2013, 09:25:40 UTC | transport-helper: trivial style fix Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:47:22 UTC |
| 57b15ea | Felipe Contreras | 31 October 2013, 09:25:39 UTC | sha1-name: trivial style cleanup Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:47:19 UTC |
| 54d07f2 | Felipe Contreras | 31 October 2013, 09:25:38 UTC | branch: trivial style fix Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:46:55 UTC |
| 19ecb56 | Felipe Contreras | 31 October 2013, 09:25:36 UTC | revision: add missing include Otherwise we might not have 'struct diff_options'. [jc: needs a matching follow-up patch to remove inclusion of diff.h from *.c files that do not themselves use anything from diff.h] Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:46:03 UTC |
| 5a3fd6a | Junio C Hamano | 31 October 2013, 20:43:35 UTC | doc/pull: clarify the illustrations The second illustration that shows the history after "git pull" spelled the remote-tracking branch with "remotes/" prefix, which is not necessary. Drop it. To match the assumption that a remote-tracking branch is used to keep track of the advancement of the master at the origin, update the first illustration that shows the history before "git pull" to show the distinction between the master currently at origin and the stale origin/master remote-tracking branch. Noticed-by: Felipe Contreras <felipe.contreras@gmail.com> Helped-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 20:45:29 UTC |
| 501a75a | Felipe Contreras | 31 October 2013, 09:25:33 UTC | t: replace pulls with merges This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 18:12:26 UTC |
| 90f867b | Felipe Contreras | 31 October 2013, 09:25:32 UTC | merge: simplify ff-only option No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 18:12:24 UTC |
| fbc812a | Kacper Kornet | 31 October 2013, 11:51:32 UTC | Fix '\%o' for printf from coreutils The printf utility provided by coreutils when interpreting '\%o' format does not recognize %o as formatting directive. For example printf '\%o 0 returns \%o and warning: ignoring excess arguments, starting with ‘0’, which results in failed tests in t5309-pack-delta-cycles.sh. In most shells the test ends with success as the printf is a builtin utility. Fix it by using '\\%o' which is interpreted consistently in all versions of printf. Signed-off-by: Kacper Kornet <draenog@pld-linux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2013, 17:24:33 UTC |
| 6ca0f80 | Rüdiger Sonderfeld | 26 October 2013, 17:43:54 UTC | web--browse: Add support for xdg-open xdg-open is a tool similar to git-web--browse. It opens a file or URL in the user's preferred application. It could probably be made default at least on Linux with a graphical environment. Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2013, 20:54:15 UTC |
| 01e8d32 | Johannes Sixt | 26 October 2013, 18:48:46 UTC | t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html We have the build configuration option DEFAULT_MAN_FORMAT to choose a format different from man pages to be used by 'git help' when no format is requested explicitly. Since 65db0443 (Set the default help format to html for msys builds, 2013-06-04) we use html on Windows by default. There is one test in t3200-branch.sh that invokes a help page. The intent of the redirections applied to the command invocation is to avoid that the man page viewer interferes with the automated test. But when the default format is not "man", this does not have the intended effect, and the HTML manual page is opened during the test run. Request "man" format explicitly to keep the test silent. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2013, 19:19:57 UTC |
| 42817b9 | Junio C Hamano | 30 October 2013, 19:17:47 UTC | Git 1.8.5-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2013, 19:17:47 UTC |
| 05ad292 | Junio C Hamano | 30 October 2013, 19:11:22 UTC | Merge branch 'maint' * maint: t5570: Update for clone-progress-to-stderr branch | 30 October 2013, 19:11:22 UTC |
| 149a813 | Junio C Hamano | 30 October 2013, 19:11:03 UTC | Merge branch 'jk/refs-c-squelch-gcc' * jk/refs-c-squelch-gcc: silence gcc array-bounds warning | 30 October 2013, 19:11:04 UTC |
| 7522c58 | Junio C Hamano | 30 October 2013, 19:11:01 UTC | Merge branch 'jk/date-c-double-semicolon' * jk/date-c-double-semicolon: drop redundant semicolon in empty while | 30 October 2013, 19:11:01 UTC |
| c02e1e4 | Junio C Hamano | 30 October 2013, 19:10:56 UTC | Merge branch 'nd/lift-path-max' * nd/lift-path-max: checkout_entry(): clarify the use of topath[] parameter entry.c: convert checkout_entry to use strbuf | 30 October 2013, 19:10:56 UTC |
| f989180 | Junio C Hamano | 30 October 2013, 19:10:52 UTC | Merge branch 'tr/valgrind-test-fix' * tr/valgrind-test-fix: Revert "test-lib: allow prefixing a custom string before "ok N" etc." Revert "test-lib: support running tests under valgrind in parallel" | 30 October 2013, 19:10:52 UTC |
| 0040d6e | Junio C Hamano | 30 October 2013, 19:10:50 UTC | Merge branch 'tr/gitk-doc-update' * tr/gitk-doc-update: Documentation: revamp gitk(1) | 30 October 2013, 19:10:50 UTC |
| 832ee79 | Junio C Hamano | 30 October 2013, 19:10:45 UTC | Merge branch 'jl/pack-transfer-avoid-double-close' The codepath that send_pack() calls pack_objects() mistakenly closed the same file descriptor twice, leading to potentially closing a wrong file descriptor that was opened in the meantime. * jl/pack-transfer-avoid-double-close: Clear fd after closing to avoid double-close error | 30 October 2013, 19:10:45 UTC |
| 02882bc | Junio C Hamano | 30 October 2013, 19:10:34 UTC | Merge branch 'sb/git-svn-docs-indent-with-ht' * sb/git-svn-docs-indent-with-ht: git-svn docs: Use tabs consistently within the ascii doc | 30 October 2013, 19:10:34 UTC |
| 4cebbe6 | Junio C Hamano | 30 October 2013, 19:10:29 UTC | Merge branch 'nd/magic-pathspec' All callers to parse_pathspec() must choose between getting no pathspec or one path that is limited to the current directory when there is no paths given on the command line, but there were two callers that violated this rule, triggering a BUG(). * nd/magic-pathspec: Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags | 30 October 2013, 19:10:33 UTC |
| 414b703 | Junio C Hamano | 30 October 2013, 19:10:27 UTC | Merge branch 'nd/gc-lock-against-each-other' * nd/gc-lock-against-each-other: gc: remove gc.pid file at end of execution | 30 October 2013, 19:10:27 UTC |
