- 12 2月, 2015 13 次提交
-
-
由 Junio C Hamano 提交于
"git push" has been taught a "--atomic" option that makes push to update more than one ref an "all-or-none" affair. * sb/atomic-push: Document receive.advertiseatomic t5543-atomic-push.sh: add basic tests for atomic pushes push.c: add an --atomic argument send-pack.c: add --atomic command line argument send-pack: rename ref_update_to_be_sent to check_to_send_update receive-pack.c: negotiate atomic push support receive-pack.c: add execute_commands_atomic function receive-pack.c: move transaction handling in a central place receive-pack.c: move iterating over all commands outside execute_commands receive-pack.c: die instead of error in case of possible future bug receive-pack.c: shorten the execute_commands loop over all commands
-
由 Junio C Hamano 提交于
Restructure "reflog expire" to fit the reflogs better with the recently updated ref API. Looked reasonable (except that some shortlog entries stood out like a sore thumb). * mh/reflog-expire: (24 commits) refs.c: let fprintf handle the formatting refs.c: don't expose the internal struct ref_lock in the header file lock_any_ref_for_update(): inline function refs.c: remove unlock_ref/close_ref/commit_ref from the refs api reflog_expire(): new function in the reference API expire_reflog(): treat the policy callback data as opaque Move newlog and last_kept_sha1 to "struct expire_reflog_cb" expire_reflog(): move rewrite to flags argument expire_reflog(): move verbose to flags argument expire_reflog(): pass flags through to expire_reflog_ent() struct expire_reflog_cb: a new callback data type Rename expire_reflog_cb to expire_reflog_policy_cb expire_reflog(): move updateref to flags argument expire_reflog(): move dry_run to flags argument expire_reflog(): add a "flags" argument expire_reflog(): extract two policy-related functions Extract function should_expire_reflog_ent() expire_reflog(): use a lock_file for rewriting the reflog file expire_reflog(): return early if the reference has no reflog expire_reflog(): rename "ref" parameter to "refname" ...
-
由 Junio C Hamano 提交于
"git log --invert-grep --grep=WIP" will show only commits that do not have the string "WIP" in their messages. * cj/log-invert-grep: log: teach --invert-grep option
-
由 Junio C Hamano 提交于
* km/gettext-n: gettext.h: add parentheses around N_ expansion if supported
-
由 Junio C Hamano 提交于
After attempting and failing a password-less authentication (e.g. kerberos), libcURL refuses to fall back to password based Basic authentication without a bit of help/encouragement. * bc/http-fallback-to-password-after-krb-fails: remote-curl: fall back to Basic auth if Negotiate fails
-
由 Junio C Hamano 提交于
Setting diff.submodule to 'log' made "git format-patch" produce broken patches. * dk/format-patch-ignore-diff-submodule: format-patch: ignore diff.submodule setting t4255: test am submodule with diff.submodule
-
由 Junio C Hamano 提交于
"git rerere" (invoked internally from many mergy operations) did not correctly signal errors when told to update the working tree files and failed to do so for whatever reason. * jn/rerere-fail-on-auto-update-failure: rerere: error out on autoupdate failure
-
由 Junio C Hamano 提交于
"git blame HEAD -- missing" failed to correctly say "HEAD" when it tried to say "No such path 'missing' in HEAD". * jk/blame-commit-label: blame.c: fix garbled error message use xstrdup_or_null to replace ternary conditionals builtin/commit.c: use xstrdup_or_null instead of envdup builtin/apply.c: use xstrdup_or_null instead of null_strdup git-compat-util: add xstrdup_or_null helper
-
由 Junio C Hamano 提交于
* ld/p4-submit-hint: git-p4: correct --prepare-p4-only instructions
-
由 Junio C Hamano 提交于
Like the "clone" subcommand, allow excluding subdirectories in the "sync" subcommand. * ld/p4-exclude-in-sync: git-p4: support excluding paths on sync
-
由 Luke Diamand 提交于
The clone subcommand has long had support for excluding subdirectories, but sync has not. This is a nuisance, since as soon as you do a sync, any changed files that were initially excluded start showing up. Move the "exclude" command-line option into the parent class; the actual behavior was already present there so it simply had to be exposed. Signed-off-by: NLuke Diamand <luke@diamand.org> Reviewed-by: NPete Wyckoff <pw@padd.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jc/coding-guidelines: CodingGuidelines: clarify C #include rules
-
由 Junio C Hamano 提交于
* ak/typofixes: t/lib-terminal.sh: fix typo pack-bitmap: fix typo
-
- 06 2月, 2015 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 2月, 2015 1 次提交
-
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* git://github.com/git-l10n/git-po: l10n: ca.po: Fix trailing whitespace
-
- 31 1月, 2015 1 次提交
-
-
由 Alex Henrie 提交于
Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>
-
- 28 1月, 2015 2 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* git://github.com/git-l10n/git-po: l10n: de.po: correct singular form l10n: de.po: translate "leave behind" correctly l10n: de.po: fix typo l10n: ca.po: update translation
-
- 27 1月, 2015 5 次提交
-
-
git://github.com/alexhenrie/git-po由 Jiang Xin 提交于
* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation
-
由 Michael J Gruber 提交于
Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
由 Michael J Gruber 提交于
This message is about leaving orphaned commits behind, not about behind an upstream branch. Try to make this clear. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
由 Benedikt Heine 提交于
Signed-off-by: NBenedikt Heine <bebe@bebehei.de> Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
由 Alex Henrie 提交于
Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>
-
- 24 1月, 2015 1 次提交
-
-
由 Luke Diamand 提交于
If you use git-p4 with the "--prepare-p4-only" option, then it prints the p4 command line to use. However, the command line was incorrect: the changelist specification must be supplied on standard input, not as an argument to p4. Signed-off-by: NLuke Diamand <luke@diamand.org> Acked-by: NPete Wyckoff <pw@padd.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 23 1月, 2015 7 次提交
-
-
由 Junio C Hamano 提交于
* js/t1050: t1050-large: generate large files without dd
-
由 Junio C Hamano 提交于
* ak/cat-file-clean-up: cat-file: use "type" and "size" from outer scope
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* git://github.com/git-l10n/git-po: l10n: correct indentation of show-branch usage l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
-
由 Junio C Hamano 提交于
* sh/asciidoc-git-version-fix: Documentation: fix version numbering
-
由 Sven van Haastregt 提交于
Version numbers in asciidoc-generated content (such as man pages) went missing as of da8a3664 (Documentation: refactor common operations into variables). Fix by putting the underscore back in the variable name. Signed-off-by: NSven van Haastregt <svenvh@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jh/empty-notes: Fix unclosed here document in t3301.sh
-
由 Kacper Kornet 提交于
Commit 908a3203 introduced indentation to here documents in t3301.sh. However in one place <<-EOF was missing -, which broke this test when run with mksh-50d. This commit fixes it. Signed-off-by: NKacper Kornet <draenog@pld-linux.org> Acked-by: NJohan Herland <johan@herland.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 1月, 2015 2 次提交
-
-
由 Alexander Kuleshov 提交于
Signed-off-by: NAlexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Alexander Kuleshov 提交于
Signed-off-by: NAlexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 21 1月, 2015 7 次提交
-
-
由 Jiang Xin 提交于
An indentation error was found right after we started l10n round 2, and commit d6589d1b (show-branch: fix indentation of usage string) and this update would fix it. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
git://github.com/git-l10n/git-po由 Jiang Xin 提交于
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jk/http-push-symref-fix: http-push: trim trailing newline from remote symref
-
由 Junio C Hamano 提交于
* ak/show-branch-usage-string: show-branch: fix indentation of usage string
-
由 Ralf Thielow 提交于
Noticed-by: NJean-Noël Avila <jn.avila@free.fr> Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jk/colors: parse_color: fix return value for numeric color values 0-8
-