| 4d0d0c3 | Junio C Hamano | 03 March 2013, 09:24:11 UTC | Git 1.8.2-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2013, 09:24:11 UTC |
| 06d67b8 | Junio C Hamano | 01 March 2013, 21:17:18 UTC | Sync with 1.8.1.5 | 01 March 2013, 21:17:18 UTC |
| e6363a4 | Junio C Hamano | 01 March 2013, 21:15:29 UTC | Git 1.8.1.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2013, 21:15:29 UTC |
| 8b1bd02 | Thomas Rast | 01 March 2013, 20:06:17 UTC | Make !pattern in .gitattributes non-fatal Before 82dce99 (attr: more matching optimizations from .gitignore, 2012-10-15), .gitattributes did not have any special treatment of a leading '!'. The docs, however, always said The rules how the pattern matches paths are the same as in `.gitignore` files; see linkgit:gitignore[5]. By those rules, leading '!' means pattern negation. So 82dce99 correctly determined that this kind of line makes no sense and should be disallowed. However, users who actually had a rule for files starting with a '!' are in a bad position: before 82dce99 '!' matched that literal character, so it is conceivable that users have .gitattributes with such lines in them. After 82dce99 the unescaped version was disallowed in such a way that git outright refuses to run(!) most commands in the presence of such a .gitattributes. It therefore becomes very hard to fix, let alone work with, such repositories. Let's at least allow the users to fix their repos: change the fatal error into a warning. Reported-by: mathstuf@gmail.com Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2013, 20:24:45 UTC |
| 1d38c69 | Junio C Hamano | 01 March 2013, 18:37:40 UTC | Merge branch 'wk/user-manual' into maint * wk/user-manual: user-manual: Flesh out uncommitted changes and submodule updates user-manual: Use request-pull to generate "please pull" text user-manual: Reorganize the reroll sections, adding 'git rebase -i' | 01 March 2013, 18:37:40 UTC |
| 5e24858 | Andrew Wong | 01 March 2013, 17:23:57 UTC | Documentation/githooks: Fix linkgit Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2013, 18:19:22 UTC |
| 443d803 | Junio C Hamano | 27 February 2013, 18:10:28 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.8.1.5 Documentation/submodule: Add --force to update synopsis | 27 February 2013, 18:10:28 UTC |
| 8d44277 | Junio C Hamano | 27 February 2013, 18:09:59 UTC | Update draft release notes to 1.8.1.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2013, 18:09:59 UTC |
| 6f0c336 | Junio C Hamano | 27 February 2013, 18:04:26 UTC | Merge branch 'ef/non-ascii-parse-options-error-diag' into maint * ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options | 27 February 2013, 18:04:26 UTC |
| 28db111 | Junio C Hamano | 27 February 2013, 18:01:21 UTC | Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint * wk/man-deny-current-branch-is-default-these-days: user-manual: typofix (ofthe->of the) user-manual: Update for receive.denyCurrentBranch=refuse | 27 February 2013, 18:01:21 UTC |
| c054ef9 | Junio C Hamano | 27 February 2013, 17:59:19 UTC | Merge branch 'jn/less-reconfigure' into maint * jn/less-reconfigure: Makefile: avoid infinite loop on configure.ac change | 27 February 2013, 17:59:19 UTC |
| 3e07d26 | Junio C Hamano | 27 February 2013, 17:47:27 UTC | Merge branch 'mh/maint-ceil-absolute' An earlier workaround designed to help people who list logical directories that will not match what getcwd(3) returns in the GIT_CEILING_DIRECTORIES had an adverse effect when it is slow to stat and readlink a directory component of an element listed on it. * mh/maint-ceil-absolute: Provide a mechanism to turn off symlink resolution in ceiling paths | 27 February 2013, 17:47:28 UTC |
| 31e54bb | Brad King | 27 February 2013, 00:41:34 UTC | Documentation/submodule: Add --force to update synopsis In commit 9db31bdf (submodule: Add --force option for git submodule update, 2011-04-01) we added the option to the implementation's usage synopsis but forgot to add it to the synopsis in the command documentation. Add the option to the synopsis in the same location it is reported in usage and re-wrap the options to avoid long lines. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2013, 15:31:01 UTC |
| 27db5a0 | Junio C Hamano | 26 February 2013, 17:17:08 UTC | Merge branch 'for-junio' of git://github.com/kusma/git * 'for-junio' of git://github.com/kusma/git: wincred: improve compatibility with windows versions wincred: accept CRLF on stdin to simplify console usage | 26 February 2013, 17:17:08 UTC |
| 13a2319 | Erik Faye-Lund | 26 February 2013, 16:58:38 UTC | Revert "compat: add strtok_r()" This reverts commit 78457bc0ccc1af8b9eb776a0b17986ebd50442bc. commit 28c5d9e ("vcs-svn: drop string_pool") previously removed the only call-site for strtok_r. So let's get rid of the compat implementation as well. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2013, 17:16:58 UTC |
| 8b2d219 | Karsten Blees | 10 January 2013, 10:52:12 UTC | wincred: improve compatibility with windows versions On WinXP, the windows credential helper doesn't work at all (due to missing Cred[Un]PackAuthenticationBuffer APIs). On Win7, the credential format used by wincred is incompatible with native Windows tools (such as the control panel applet or 'cmdkey.exe /generic'). These Windows tools only set the TargetName, UserName and CredentialBlob members of the CREDENTIAL structure (where CredentialBlob is the UTF-16-encoded password). Remove the unnecessary packing / unpacking of the password, along with the related API definitions, for compatibility with Windows XP. Don't use CREDENTIAL_ATTRIBUTEs to identify credentials for compatibility with Windows credential manager tools. Parse the protocol, username, host and path fields from the credential's target name instead. Credentials created with an old wincred version will have mangled or empty passwords after this change. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> | 26 February 2013, 16:42:46 UTC |
| 3b12f46 | Karsten Blees | 09 January 2013, 11:49:26 UTC | wincred: accept CRLF on stdin to simplify console usage The windows credential helper currently only accepts LF on stdin, but bash and cmd.exe both send CRLF. This prevents interactive use in the console. Change the stdin parser to optionally accept CRLF. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> | 26 February 2013, 16:42:24 UTC |
| 4dac067 | Junio C Hamano | 25 February 2013, 16:39:23 UTC | Git 1.8.2-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2013, 17:03:26 UTC |
| 98b57f9 | Junio C Hamano | 25 February 2013, 17:02:58 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: vi.po: Updated 5 new messages (2009t0f0u) l10n: Update Swedish translation (2009t0f0u) l10n: Update Swedish translation (2004t0f0u) l10n: zh_CN.po: translate 5 new messages l10n: git.pot: v1.8.2 round 3 (5 new) | 25 February 2013, 17:02:58 UTC |
| 2a4a26b | Junio C Hamano | 25 February 2013, 16:27:50 UTC | Sync with 'maint' Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2013, 16:28:06 UTC |
| 3ca26e8 | Junio C Hamano | 25 February 2013, 16:27:17 UTC | Merge branch 'wk/user-manual' Further updates to the user manual. * wk/user-manual: user-manual: Flesh out uncommitted changes and submodule updates user-manual: Use request-pull to generate "please pull" text user-manual: Reorganize the reroll sections, adding 'git rebase -i' | 25 February 2013, 16:27:17 UTC |
| bb07a3f | Junio C Hamano | 25 February 2013, 16:27:13 UTC | Merge branch 'jn/less-reconfigure' A change made on v1.8.1.x maintenance track had a nasty regression to break the build when autoconf is used. * jn/less-reconfigure: Makefile: avoid infinite loop on configure.ac change | 25 February 2013, 16:27:13 UTC |
| ef94636 | Junio C Hamano | 25 February 2013, 16:27:09 UTC | Merge branch 'as/check-ignore' "git check-ignore ." segfaulted, as a function it calls deep in its callchain took a string in the <ptr, length> form but did not stop when given an empty string. * as/check-ignore: name-hash: allow hashing an empty string t0008: document test_expect_success_multi | 25 February 2013, 16:27:09 UTC |
| a2b109f | Junio C Hamano | 25 February 2013, 16:27:04 UTC | Merge branch 'ct/autoconf-htmldir' An earlier change to config.mak.autogen broke a build driven by the ./configure script when --htmldir is not specified on the command line of ./configure. * ct/autoconf-htmldir: Bugfix: undefined htmldir in config.mak.autogen | 25 February 2013, 16:27:04 UTC |
| 6368a71 | Junio C Hamano | 25 February 2013, 16:26:59 UTC | Merge branch 'wk/man-deny-current-branch-is-default-these-days' * wk/man-deny-current-branch-is-default-these-days: user-manual: typofix (ofthe->of the) | 25 February 2013, 16:26:59 UTC |
| 7a0d8db | Junio C Hamano | 25 February 2013, 16:15:40 UTC | Prepare for 1.8.1.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2013, 16:26:25 UTC |
| cd9c038 | Junio C Hamano | 25 February 2013, 16:04:19 UTC | Merge branch 'jc/mention-tracking-for-pull-default' into maint * jc/mention-tracking-for-pull-default: doc: mention tracking for pull.default | 25 February 2013, 16:04:20 UTC |
| 5cc5f09 | Junio C Hamano | 25 February 2013, 16:04:17 UTC | Merge branch 'mm/config-intro-in-git-doc' into maint * mm/config-intro-in-git-doc: git.txt: update description of the configuration mechanism | 25 February 2013, 16:04:18 UTC |
| 92f561d | Junio C Hamano | 25 February 2013, 16:04:05 UTC | Merge branch 'da/p4merge-mktemp-fix' into maint * da/p4merge-mktemp-fix: p4merge: fix printf usage | 25 February 2013, 16:04:05 UTC |
| 8552e2e | Junio C Hamano | 25 February 2013, 16:04:03 UTC | Merge branch 'bw/get-tz-offset-perl' into maint * bw/get-tz-offset-perl: cvsimport: format commit timestamp ourselves without using strftime perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases Move Git::SVN::get_tz to Git::get_tz_offset | 25 February 2013, 16:04:03 UTC |
| b79faa9 | Junio C Hamano | 25 February 2013, 16:04:01 UTC | Merge branch 'al/mergetool-printf-fix' into maint * al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains % | 25 February 2013, 16:04:01 UTC |
| 75288cc | Junio C Hamano | 25 February 2013, 16:03:59 UTC | Merge branch 'jx/utf8-printf-width' into maint * jx/utf8-printf-width: Add utf8_fprintf helper that returns correct number of columns | 25 February 2013, 16:03:59 UTC |
| d08d259 | Junio C Hamano | 25 February 2013, 16:03:57 UTC | Merge branch 'mg/bisect-doc' into maint * mg/bisect-doc: git-bisect.txt: clarify that reset quits bisect | 25 February 2013, 16:03:57 UTC |
| 7927f51 | Junio C Hamano | 25 February 2013, 16:03:54 UTC | Merge branch 'sp/smart-http-content-type-check' into maint * sp/smart-http-content-type-check: http_request: reset "type" strbuf before adding t5551: fix expected error output Verify Content-Type from smart HTTP servers | 25 February 2013, 16:03:54 UTC |
| d49f9f1 | Junio C Hamano | 25 February 2013, 16:03:51 UTC | Merge branch 'jc/combine-diff-many-parents' into maint * jc/combine-diff-many-parents: t4038: add tests for "diff --cc --raw <trees>" combine-diff: lift 32-way limit of combined diff | 25 February 2013, 16:03:51 UTC |
| 66d12f9 | Junio C Hamano | 25 February 2013, 16:03:44 UTC | Merge branch 'jk/apply-similaritly-parsing' into maint * jk/apply-similaritly-parsing: builtin/apply: tighten (dis)similarity index parsing | 25 February 2013, 16:03:44 UTC |
| 7be0931 | Junio C Hamano | 25 February 2013, 16:03:37 UTC | Merge branch 'jk/remote-helpers-doc' into maint * jk/remote-helpers-doc: Rename {git- => git}remote-helpers.txt | 25 February 2013, 16:03:37 UTC |
| aaf4f28 | Junio C Hamano | 25 February 2013, 16:03:34 UTC | Merge branch 'ab/gitweb-use-same-scheme' into maint * ab/gitweb-use-same-scheme: gitweb: refer to picon/gravatar images over the same scheme | 25 February 2013, 16:03:34 UTC |
| c0e96dd | Junio C Hamano | 25 February 2013, 16:03:32 UTC | Merge branch 'zk/clean-report-failure' into maint * zk/clean-report-failure: git-clean: Display more accurate delete messages | 25 February 2013, 16:03:32 UTC |
| 0e0c3f2 | Junio C Hamano | 25 February 2013, 16:03:27 UTC | Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint * nd/clone-no-separate-git-dir-with-bare: clone: forbid --bare --separate-git-dir <dir> | 25 February 2013, 16:03:27 UTC |
| a8e00d7 | Junio C Hamano | 25 February 2013, 16:03:20 UTC | Merge branch 'da/p4merge-mktemp' into maint * da/p4merge-mktemp: mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder | 25 February 2013, 16:03:20 UTC |
| 4f021b3 | Greg Price | 25 February 2013, 05:27:20 UTC | Documentation: "advice" is uncountable "Advice" is a mass noun, not a count noun; it's not ordinarily pluralized. Signed-off-by: Greg Price <price@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2013, 15:31:28 UTC |
| 7ec30aa | Michael Haggerty | 20 February 2013, 09:09:24 UTC | Provide a mechanism to turn off symlink resolution in ceiling paths Commit 1b77d83cab 'setup_git_directory_gently_1(): resolve symlinks in ceiling paths' changed the setup code to resolve symlinks in the entries in GIT_CEILING_DIRECTORIES. Because those entries are compared textually to the symlink-resolved current directory, an entry in GIT_CEILING_DIRECTORIES that contained a symlink would have no effect. It was known that this could cause performance problems if the symlink resolution *itself* touched slow filesystems, but it was thought that such use cases would be unlikely. The intention of the earlier change was to deal with a case when the user has this: GIT_CEILING_DIRECTORIES=/home/gitster but in reality, /home/gitster is a symbolic link to somewhere else, e.g. /net/machine/home4/gitster. A textual comparison between the specified value /home/gitster and the location getcwd(3) returns would not help us, but readlink("/home/gitster") would still be fast. After this change was released, Anders Kaseorg <andersk@mit.edu> reported: > [...] my computer has been acting so slow when I’m not connected to > the network. I put various network filesystem paths in > $GIT_CEILING_DIRECTORIES, such as > /afs/athena.mit.edu/user/a/n/andersk (to avoid hitting its parents > /afs/athena.mit.edu, /afs/athena.mit.edu/user/a, and > /afs/athena.mit.edu/user/a/n which all live in different AFS > volumes). Now when I’m not connected to the network, every > invocation of Git, including the __git_ps1 in my shell prompt, waits > for AFS to timeout. To allow users to work around this problem, give them a mechanism to turn off symlink resolution in GIT_CEILING_DIRECTORIES entries. All the entries that follow an empty entry will not be checked for symbolic links and used literally in comparison. E.g. with these: GIT_CEILING_DIRECTORIES=:/foo/bar:/xyzzy or GIT_CEILING_DIRECTORIES=/foo/bar::/xyzzy we will not readlink("/xyzzy") because it comes after an empty entry. With the former (but not with the latter), "/foo/bar" comes after an empty entry, and we will not readlink it, either. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2013, 19:37:34 UTC |
| 7f1b697 | Jeff King | 21 February 2013, 06:26:14 UTC | Makefile: avoid infinite loop on configure.ac change If you are using autoconf and change the configure.ac, the Makefile will notice that config.status is older than configure.ac, and will attempt to rebuild and re-run the configure script to pick up your changes. The first step in doing so is to run "make configure". Unfortunately, this tries to include config.mak.autogen, which depends on config.status, which depends on configure.ac; so we must rebuild config.status. Which leads to us running "make configure", and so on. It's easy to demonstrate with: make configure ./configure touch configure.ac make We can break this cycle by not re-invoking make to build "configure", and instead just putting its rules inline into our config.status rebuild procedure. We can avoid a copy by factoring the rules into a make variable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2013, 07:56:05 UTC |
| b3600c3 | Junio C Hamano | 20 February 2013, 05:57:27 UTC | Sync with v1.8.1.4 | 20 February 2013, 05:57:27 UTC |
| dff9f88 | Junio C Hamano | 19 February 2013, 05:48:05 UTC | Git 1.8.1.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2013, 05:54:22 UTC |
| 0ee7198 | Junio C Hamano | 20 February 2013, 05:54:15 UTC | Merge branch 'ob/imap-send-ssl-verify' into maint * ob/imap-send-ssl-verify: imap-send: support subjectAltName as well imap-send: the subject of SSL certificate must match the host imap-send: move #ifdef around | 20 February 2013, 05:54:15 UTC |
| e174744 | Oswald Buddenhagen | 15 February 2013, 20:59:53 UTC | imap-send: support subjectAltName as well Check not only the common name of the certificate subject, but also check the subject alternative DNS names as well, when verifying that the certificate matches that of the host we are trying to talk to. Signed-off-by: Oswald Buddenhagen <ossi@kde.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2013, 05:47:22 UTC |
| b62fb07 | Oswald Buddenhagen | 15 February 2013, 20:50:35 UTC | imap-send: the subject of SSL certificate must match the host We did not check a valid certificate's subject at all, and would have happily talked with a wrong host after connecting to an incorrect address and getting a valid certificate that does not belong to the host we intended to talk to. Signed-off-by: Oswald Buddenhagen <ossi@kde.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2013, 05:47:22 UTC |
| c527ace | Tran Ngoc Quan | 20 February 2013, 00:16:44 UTC | l10n: vi.po: Updated 5 new messages (2009t0f0u) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 20 February 2013, 00:17:58 UTC |
| 55d9bf0 | Jiang Xin | 19 February 2013, 11:23:29 UTC | Bugfix: undefined htmldir in config.mak.autogen Html documents will be installed to root dir (/) no matter what prefix is set, if run these commands before `make` and `make install-html`: $ make configure $ ./configure --prefix=<PREFIX> After the installation, all the html documents will copy to rootdir (/), and: $ git --html-path <PREFIX> $ git help -w something fatal: '<PREFIX>': not a documentation directory. This is because the variable "htmldir" points to a undefined variable "$(docdir)" in file "config.mak.autogen", which is generated by running `./configure`. By default $(docdir) generated by configure is supposed be set this way: datarootdir='${prefix}/share' htmldir='${docdir}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' but since fc1c5415d69d (Honor configure's htmldir switch, 2013-02-02), we only set and export htmldir without doing so for PACKAGE_TARNAME (which is set to 'git' by the configure script). Add the required two variables "PACKAGE_TARNAME" and "docdir" to file "config.mak.in" will work this issue around. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 23:27:08 UTC |
| c19387e | Junio C Hamano | 19 February 2013, 19:56:44 UTC | name-hash: allow hashing an empty string Usually we do not pass an empty string to the function hash_name() because we almost always ask for hash values for a path that is a candidate to be added to the index. However, check-ignore (and most likely check-attr, but I didn't check) apparently has a callchain to ask the hash value for an empty path when it was given a "." from the top-level directory to ask "Is the path . excluded by default?" Make sure that hash_name() does not overrun the end of the given pathname even when it is empty. Remove a sweep-the-issue-under-the-rug conditional in check-ignore that avoided to pass an empty string to the callchain while at it. It is a valid question to ask for check-ignore if the top-level is set to be ignored by default, even though the answer is most likely no, if only because there is currently no way to specify such an entry in the .gitignore file. But it is an unusual thing to ask and it is not worth optimizing for it by special casing at the top level of the call chain. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 22:00:12 UTC |
| 9148673 | W. Trevor King | 19 February 2013, 10:05:02 UTC | user-manual: Flesh out uncommitted changes and submodule updates If you try and update a submodule with a dirty working directory, you get an error message like: $ git submodule update error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting ... Mention this in the submodule notes. The previous phrase was short enough that I originally thought it might have been referring to the reflog note (obviously, uncommitted changes will not show up in the reflog either ;). Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 20:56:30 UTC |
| ae6ef55 | W. Trevor King | 19 February 2013, 10:05:01 UTC | user-manual: Use request-pull to generate "please pull" text Less work and more error checking (e.g. does a merge base exist?). Add an explicit push before request-pull to satisfy request-pull, which checks to make sure the references are publically available. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 20:56:30 UTC |
| 6c26bf4 | W. Trevor King | 19 February 2013, 10:05:00 UTC | user-manual: Reorganize the reroll sections, adding 'git rebase -i' I think this interface is often more convenient than extended cherry picking or using 'git format-patch'. In fact, I removed the cherry-pick section entirely. The entry-level suggestions for rerolling are now: 1. git commit --amend 2. git format-patch origin git reset --hard origin ...edit and reorder patches... git am *.patch 3. git rebase -i origin Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 20:56:11 UTC |
| 6866654 | Adam Spiers | 19 February 2013, 14:06:22 UTC | t0008: document test_expect_success_multi test_expect_success_multi() helper function warrants some explanation, since at first sight it may seem like generic test framework plumbing, but is in fact specific to testing check-ignore, and allows more thorough testing of the various output formats without significantly increase the size of t0008. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 17:37:39 UTC |
| 2afd3ef | Peter Krefting | 19 February 2013, 09:26:36 UTC | l10n: Update Swedish translation (2009t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 19 February 2013, 09:26:36 UTC |
| 1415174 | Peter Krefting | 18 February 2013, 22:01:07 UTC | l10n: Update Swedish translation (2004t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 19 February 2013, 09:23:54 UTC |
| 63af42f | Jiang Xin | 19 February 2013, 06:52:24 UTC | l10n: zh_CN.po: translate 5 new messages Translate 5 new messages came from git.pot update in 235537a (l10n: git.pot: v1.8.2 round 3 (5 new)). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 19 February 2013, 06:52:24 UTC |
| 235537a | Jiang Xin | 19 February 2013, 05:36:11 UTC | l10n: git.pot: v1.8.2 round 3 (5 new) Generate po/git.pot from v1.8.2-rc0-16-g20a59 for git v1.8.2 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 19 February 2013, 05:36:11 UTC |
| 1e1fe52 | Junio C Hamano | 15 February 2013, 20:32:19 UTC | imap-send: move #ifdef around Instead of adding an early return to the inside of the ssl_socket_connect() function for NO_OPENSSL compilation, split it into a separate stub function. No functional change, but the next change to extend ssl_socket_connect() will become easier to read this way. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 00:33:07 UTC |
| 20a599e | Junio C Hamano | 19 February 2013, 00:05:02 UTC | Merge branch 'jc/mention-tracking-for-pull-default' We stopped mentioning `tracking` is a deprecated but supported synonym for `upstream` in pull.default even though we have no intention of removing the support for it. * jc/mention-tracking-for-pull-default: doc: mention tracking for pull.default | 19 February 2013, 00:05:03 UTC |
| 48050fb | Junio C Hamano | 19 February 2013, 00:04:58 UTC | Merge branch 'mm/config-intro-in-git-doc' * mm/config-intro-in-git-doc: git.txt: update description of the configuration mechanism | 19 February 2013, 00:04:58 UTC |
| ce209d0 | Junio C Hamano | 18 February 2013, 23:59:33 UTC | RelNotes 1.8.2: push-simple will not be in effect in this release Also migration path for the default behaviour of "git add -u/-A" run in a subdirectory is worth mentioning. Both pointed out by Matthieu Moy. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 23:59:33 UTC |
| 31e6a4e | Martin Erik Werner | 18 February 2013, 22:59:03 UTC | shell-prompt: clean up nested if-then Minor clean up of if-then nesting in checks for environment variables and config options. No functional changes. Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 23:33:31 UTC |
| 50995ed | Junio C Hamano | 18 February 2013, 20:43:00 UTC | user-manual: typofix (ofthe->of the) Noticed by Drew Northup Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 20:43:00 UTC |
| 4cb8a83 | Junio C Hamano | 18 February 2013, 08:50:33 UTC | Merge branch 'maint' * maint: user-manual: use -o latest.tar.gz to create a gzipped tarball user-manual: use 'git config --global user.*' for setup user-manual: mention 'git remote add' for remote branch config user-manual: give 'git push -f' as an alternative to +master user-manual: use 'remote add' to setup push URLs | 18 February 2013, 08:50:33 UTC |
| 7ed1690 | W. Trevor King | 18 February 2013, 00:16:01 UTC | user-manual: use -o latest.tar.gz to create a gzipped tarball This functionality was introduced by 0e804e09 (archive: provide builtin .tar.gz filter, 2011-07-21) for v1.7.7. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:52 UTC |
| 632cc3e | W. Trevor King | 18 February 2013, 00:15:58 UTC | user-manual: use 'git config --global user.*' for setup A simple command line call is easier than spawning an editor, especially for folks new to ideas like the "command line" and "text editors". This is also the approach suggested by 'git commit' if you try and commit without having configured user.name or user.email. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:47 UTC |
| 47adb8a | W. Trevor King | 18 February 2013, 00:15:56 UTC | user-manual: mention 'git remote add' for remote branch config I hardly ever setup remote.<name>.url using 'git config'. While it may be instructive to do so, we should also point out 'git remote add'. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:42 UTC |
| d1471e0 | W. Trevor King | 18 February 2013, 00:15:55 UTC | user-manual: give 'git push -f' as an alternative to +master This mirrors existing language in the description of 'git fetch'. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:37 UTC |
| e9b4908 | W. Trevor King | 18 February 2013, 00:15:53 UTC | user-manual: use 'remote add' to setup push URLs There is no need to use here documents to setup this configuration. It is easier, less confusing, and more robust to use `git remote add` directly. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:30 UTC |
| 461247b | Junio C Hamano | 18 February 2013, 08:01:12 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: zh_CN.po: translate 35 new messages l10n: vi.po: update new strings (2004t0u0f) l10n: Update git.pot (35 new, 14 removed messages) | 18 February 2013, 08:01:12 UTC |
| a77c07d | Jiang Xin | 14 February 2013, 09:47:45 UTC | l10n: zh_CN.po: translate 35 new messages Translate 35 new messages came from git.pot update in 9caaf23 (l10n: Update git.pot (35 new, 14 removed messages)). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 18 February 2013, 01:52:33 UTC |
| 004825d | Junio C Hamano | 17 February 2013, 23:35:33 UTC | Git 1.8.2-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2013, 23:35:33 UTC |
| ce735bf | Junio C Hamano | 17 February 2013, 23:25:57 UTC | Merge branch 'jc/hidden-refs' Allow the server side to redact the refs/ namespace it shows to the client. Will merge to 'master'. * jc/hidden-refs: upload/receive-pack: allow hiding ref hierarchies upload-pack: simplify request validation upload-pack: share more code | 17 February 2013, 23:25:57 UTC |
| abea4dc | Junio C Hamano | 17 February 2013, 23:25:51 UTC | Merge branch 'mp/diff-algo-config' Add diff.algorithm configuration so that the user does not type "diff --histogram". * mp/diff-algo-config: diff: Introduce --diff-algorithm command line option config: Introduce diff.algorithm variable git-completion.bash: Autocomplete --minimal and --histogram for git-diff | 17 February 2013, 23:25:52 UTC |
| adbbc6f | Junio C Hamano | 17 February 2013, 23:25:46 UTC | Merge branch 'mw/bash-prompt-show-untracked-config' Allows skipping the untracked check GIT_PS1_SHOWUNTRACKEDFILES asks for the git-prompt (in contrib/) per repository. * mw/bash-prompt-show-untracked-config: t9903: add extra tests for bash.showDirtyState t9903: add tests for bash.showUntrackedFiles shell prompt: add bash.showUntrackedFiles option | 17 February 2013, 23:25:46 UTC |
| 00abd71 | Junio C Hamano | 17 February 2013, 23:25:19 UTC | Merge branch 'jk/rebase-i-comment-char' Finishing touches to the earlier core.commentchar topic to cover "rebase -i" as well. * jk/rebase-i-comment-char: rebase -i: respect core.commentchar | 17 February 2013, 23:25:20 UTC |
| d04f998 | Junio C Hamano | 17 February 2013, 23:23:20 UTC | Merge branch 'jk/read-commit-buffer-data-after-free' "git log --grep=<pattern>" used to look for the pattern in literal bytes of the commit log message and ignored the log-output encoding. * jk/read-commit-buffer-data-after-free: log: re-encode commit messages before grepping | 17 February 2013, 23:23:20 UTC |
| 77c8e54 | Tran Ngoc Quan | 17 February 2013, 01:42:47 UTC | l10n: vi.po: update new strings (2004t0u0f) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 17 February 2013, 01:43:34 UTC |
| 7b6e784 | Junio C Hamano | 15 February 2013, 20:24:54 UTC | Update draft release notes to 1.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2013, 20:24:54 UTC |
| c0179c0 | Matthieu Moy | 14 February 2013, 15:36:54 UTC | git.txt: update description of the configuration mechanism The old Git version where it appeared is now useful only to historians, not to normal users. Also, the text was mentioning only the per-repo config file, but this is a good place to teach that customization can also be made per-user. While at it, remove a now-defunct e-mail from an example. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2013, 17:05:55 UTC |
| 17e45f8 | Junio C Hamano | 15 February 2013, 00:06:29 UTC | Merge branch 'wk/man-deny-current-branch-is-default-these-days' * wk/man-deny-current-branch-is-default-these-days: user-manual: Update for receive.denyCurrentBranch=refuse | 15 February 2013, 00:06:29 UTC |
| f5af28b | Junio C Hamano | 15 February 2013, 00:06:24 UTC | Merge branch 'mk/make-rm-depdirs-could-be-empty' "make COMPUTE_HEADER_DEPENDENCIES=no clean" would try to run "rm -rf $(dep_dirs)" with an empty dep_dir, but some implementations of "rm -rf" barf on an empty argument list. * mk/make-rm-depdirs-could-be-empty: Makefile: don't run "rm" without any files | 15 February 2013, 00:06:24 UTC |
| b1bcb97 | Junio C Hamano | 15 February 2013, 00:06:19 UTC | Merge branch 'mm/config-local-completion' * mm/config-local-completion: completion: support 'git config --local' | 15 February 2013, 00:06:19 UTC |
| 6bdecc8 | Junio C Hamano | 15 February 2013, 00:06:14 UTC | Merge branch 'ef/non-ascii-parse-options-error-diag' * ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options | 15 February 2013, 00:06:14 UTC |
| bfc1f6a | Junio C Hamano | 15 February 2013, 00:06:08 UTC | Merge branch 'mk/old-expat' * mk/old-expat: Allow building with xmlparse.h | 15 February 2013, 00:06:08 UTC |
| c0acef9 | Junio C Hamano | 15 February 2013, 00:05:56 UTC | Merge branch 'da/p4merge-mktemp-fix' * da/p4merge-mktemp-fix: p4merge: fix printf usage | 15 February 2013, 00:05:56 UTC |
| 3078419 | Junio C Hamano | 14 February 2013, 23:51:43 UTC | Documentation/git-add: kill remaining <filepattern> The merge at 5bf72ed2 missed another instance of <filepattern> that we were converting to <pathspec>. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2013, 23:51:43 UTC |
| d9be248 | W. Trevor King | 08 February 2013, 17:04:20 UTC | user-manual: Update for receive.denyCurrentBranch=refuse acd2a45 (Refuse updating the current branch in a non-bare repository via push, 2009-02-11) changed the default to refuse such a push, but it forgot to update the docs. 7d182f5 (Documentation: receive.denyCurrentBranch defaults to 'refuse', 2010-03-17) updated Documentation/config.txt, but forgot to update the user manual. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2013, 18:54:58 UTC |
| 02339dd | Junio C Hamano | 14 February 2013, 18:43:07 UTC | Update draft release notes to 1.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2013, 18:43:07 UTC |
| a1d68be | Junio C Hamano | 14 February 2013, 18:29:59 UTC | Merge branch 'jk/diff-graph-cleanup' Refactors a lot of repetitive code sequence from the graph drawing code and adds it to the combined diff output. * jk/diff-graph-cleanup: combine-diff.c: teach combined diffs about line prefix diff.c: use diff_line_prefix() where applicable diff: add diff_line_prefix function diff.c: make constant string arguments const diff: write prefix to the correct file graph: output padding for merge subsequent parents | 14 February 2013, 18:29:59 UTC |
| 55f9c83 | Junio C Hamano | 14 February 2013, 18:29:54 UTC | Merge branch 'nd/status-show-in-progress' * nd/status-show-in-progress: status: show the branch name if possible in in-progress info | 14 February 2013, 18:29:54 UTC |
| 97a8f02 | Junio C Hamano | 14 February 2013, 18:29:49 UTC | Merge branch 'mm/remote-mediawiki-build' * mm/remote-mediawiki-build: git-remote-mediawiki: use toplevel's Makefile Makefile: make script-related rules usable from subdirectories | 14 February 2013, 18:29:49 UTC |
| 01e1406 | Junio C Hamano | 14 February 2013, 18:29:44 UTC | Merge branch 'bw/get-tz-offset-perl' * bw/get-tz-offset-perl: cvsimport: format commit timestamp ourselves without using strftime perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases Move Git::SVN::get_tz to Git::get_tz_offset | 14 February 2013, 18:29:44 UTC |
| ba56d70 | Junio C Hamano | 14 February 2013, 18:29:37 UTC | Merge branch 'al/mergetool-printf-fix' * al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains % | 14 February 2013, 18:29:37 UTC |
| 393b7c3 | Junio C Hamano | 14 February 2013, 18:29:23 UTC | Merge branch 'jk/error-const-return' * jk/error-const-return: Use __VA_ARGS__ for all of error's arguments | 14 February 2013, 18:29:23 UTC |
| 3cc3cf9 | Junio C Hamano | 14 February 2013, 18:29:08 UTC | Merge branch 'jx/utf8-printf-width' Use a new helper that prints a message and counts its display width to align the help messages parse-options produces. * jx/utf8-printf-width: Add utf8_fprintf helper that returns correct number of columns | 14 February 2013, 18:29:08 UTC |
| eb213fc | Junio C Hamano | 14 February 2013, 18:29:01 UTC | Merge branch 'mg/bisect-doc' * mg/bisect-doc: git-bisect.txt: clarify that reset quits bisect | 14 February 2013, 18:29:01 UTC |
