- 26 6月, 2014 9 次提交
-
-
由 Junio C Hamano 提交于
* rs/blame-refactor: blame: simplify prepare_lines() blame: factor out get_next_line()
-
由 Junio C Hamano 提交于
* pb/trim-trailing-spaces: t0008: do not depend on 'echo' handling backslashes specially
-
由 Junio C Hamano 提交于
* mc/doc-submodule-sync-recurse: submodule: document "sync --recursive"
-
由 Junio C Hamano 提交于
* sp/complete-ext-alias: completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
-
由 Junio C Hamano 提交于
* mc/git-p4-prepare-p4-only: git-p4: fix submit in non --prepare-p4-only mode
-
由 Junio C Hamano 提交于
* jk/repack-pack-writebitmaps-config: t7700: drop explicit --no-pack-kept-objects from .keep test repack: introduce repack.writeBitmaps config option repack: simplify handling of --write-bitmap-index pack-objects: stop respecting pack.writebitmaps
-
由 Junio C Hamano 提交于
Some subcommands do not want to be aliased because of the side effects that happens while the definitions of the aliases are looked up from configuration system. * nd/init-restore-env: git potty: restore environments after alias expansion
-
由 Junio C Hamano 提交于
Recent updates to "git repack" started to duplicate objects that are in packfiles marked with .keep flag into the new packfile by mistake. * jk/repack-pack-keep-objects: repack: s/write_bitmap/&s/ in code repack: respect pack.writebitmaps repack: do not accidentally pack kept objects by default
-
由 Junio C Hamano 提交于
* fr/sequencer-fail-with-not-one-upon-no-ff: sequencer: signal failed ff as an aborted, not a conflicted merge
-
- 21 6月, 2014 8 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* 'jc/test-lazy-prereq' (early part): t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite t3302: do not chdir around in the primary test process t3302: coding style updates test: turn USR_BIN_TIME into a lazy prerequisite test: turn EXPENSIVE into a lazy prerequisite
-
由 Junio C Hamano 提交于
* jc/fetch-pull-refmap: docs: Explain the purpose of fetch's and pull's <refspec> parameter. fetch: allow explicit --refmap to override configuration fetch doc: add a section on configured remote-tracking branches fetch doc: remove "short-cut" section fetch doc: update refspec format description fetch doc: on pulling multiple refspecs fetch doc: remove notes on outdated "mixed layout" fetch doc: update note on '+' in front of the refspec fetch doc: move FETCH_HEAD material lower and add an example fetch doc: update introductory part for clarity
-
由 Junio C Hamano 提交于
* mt/send-email-cover-to-cc: t9001: avoid non-portable '\n' with sed test/send-email: to-cover, cc-cover tests git-send-email: two new options: to-cover, cc-cover
-
由 Junio C Hamano 提交于
* tb/t5551-clone-notice-to-stderr: t5551: fix the 50,000 tag test
-
由 Junio C Hamano 提交于
* rs/more-starts-with: Use starts_with() for C strings instead of memcmp()
-
由 Junio C Hamano 提交于
* jm/api-strbuf-doc: api-strbuf.txt minor typos
-
由 Junio C Hamano 提交于
"git log -2master" is a common typo that shows two commits starting from whichever random branch that is not 'master' that happens to be checked out currently. * jc/revision-dash-count-parsing: revision: parse "git log -<count>" more carefully
-
- 17 6月, 2014 23 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Allow specifying only certain individual test pieces to be run using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'"). * ib/test-selectively-run: t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests test-lib: '--run' to run only specific tests test-lib: tests skipped by GIT_SKIP_TESTS say so test-lib: document short options in t/README
-
由 Junio C Hamano 提交于
* ta/string-list-init: string-list: spell all values out that are given to a string_list initializer
-
由 Junio C Hamano 提交于
* jm/dedup-test-config: t/t7810-grep.sh: remove duplicate test_config()
-
由 Junio C Hamano 提交于
* dt/refs-check-refname-component-optim: refs.c: optimize check_refname_component()
-
由 Junio C Hamano 提交于
* sk/test-cmp-bin: t5000, t5003: do not use test_cmp to compare binary files
-
由 Junio C Hamano 提交于
* sh/enable-preloadindex: environment.c: enable core.preloadindex by default
-
由 Junio C Hamano 提交于
* rs/read-ref-at: refs.c: change read_ref_at to use the reflog iterators
-
由 Junio C Hamano 提交于
* jk/error-resolve-conflict-advice: error_resolve_conflict: drop quotations around operation error_resolve_conflict: rewrap advice message
-
由 Junio C Hamano 提交于
Avoid unnecessary copy of previous contents when extending the hashtable used in pack-objects. * rs/pack-objects-no-unnecessary-realloc: pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
-
由 Junio C Hamano 提交于
* lt/log-auto-decorate: git log: support "auto" decorations
-
由 Junio C Hamano 提交于
* jm/doc-wording-tweaks: Documentation: wording fixes in the user manual and glossary
-
由 Junio C Hamano 提交于
* jm/format-patch-mail-sig: format-patch: add "--signature-file=<file>" option format-patch: make newline after signature conditional
-
由 Junio C Hamano 提交于
Propagate the error messages from the webserver better to the client coming over the HTTP transport. * jk/http-errors: http: default text charset to iso-8859-1 remote-curl: reencode http error messages strbuf: add strbuf_reencode helper http: optionally extract charset parameter from content-type http: extract type/subtype portion of content-type t5550: test display of remote http error messages t/lib-httpd: use write_script to copy CGI scripts test-lib: preserve GIT_CURL_VERBOSE from the environment
-
由 Junio C Hamano 提交于
mailmap.file configuration names a pathname, hence should honor ~/path and ~user/path as its value. * ow/config-mailmap-pathname: config: respect '~' and '~user' in mailmap.file
-
由 Junio C Hamano 提交于
Allow remote-helper/fast-import based transport to rename the refs while transferring the history. * fc/remote-helper-refmap: transport-helper: remove unnecessary strbuf resets transport-helper: add support to delete branches fast-export: add support to delete refs fast-import: add support to delete refs transport-helper: add support to push symbolic refs transport-helper: add support for old:new refspec fast-export: add new --refspec option fast-export: improve argument parsing
-
由 Junio C Hamano 提交于
"git gc --auto" was recently changed to run in the background to give control back early to the end-user sitting in front of the terminal, but it forgot that housekeeping involving reflogs should be done without other processes competing for accesses to the refs. * nd/daemonize-gc: gc --auto: do not lock refs in the background
-
由 Junio C Hamano 提交于
* jm/t9138-style-fix: t9138-git-svn-authors-prog.sh fixups
-
由 Junio C Hamano 提交于
* jm/instaweb-apache-24: git-instaweb: add support for Apache 2.4
-
由 Junio C Hamano 提交于
"git remote rm" and "git remote prune" can involve removing many refs at once, which is not a very efficient thing to do when very many refs exist in the packed-refs file. * jl/remote-rm-prune: remote prune: optimize "dangling symref" check/warning remote: repack packed-refs once when deleting multiple refs remote rm: delete remote configuration as the last
-
由 Junio C Hamano 提交于
The completion code did not know about quite a few options that are common between "git merge" and "git pull", and a couple of options unique to "git merge". * jk/complete-merge-pull: completion: add missing options for git-merge completion: add a note that merge options are shared
-
由 Junio C Hamano 提交于
Like calloc(3), xcalloc() takes nmemb and then size. * bg/xcalloc-nmemb-then-size: transport-helper.c: rearrange xcalloc arguments remote.c: rearrange xcalloc arguments reflog-walk.c: rearrange xcalloc arguments pack-revindex.c: rearrange xcalloc arguments notes.c: rearrange xcalloc arguments imap-send.c: rearrange xcalloc arguments http-push.c: rearrange xcalloc arguments diff.c: rearrange xcalloc arguments config.c: rearrange xcalloc arguments commit.c: rearrange xcalloc arguments builtin/remote.c: rearrange xcalloc arguments builtin/ls-remote.c: rearrange xcalloc arguments
-
由 Junio C Hamano 提交于
submodule.*.ignore and diff.ignoresubmodules are used to ignore all submodule changes in "diff" output, but it can be confusing to apply these configuration values to status and commit. This is a backward-incompatible change, but should be so in a good way (aka bugfix). * jl/status-added-submodule-is-never-ignored: commit -m: commit staged submodules regardless of ignore config status/commit: show staged submodules regardless of ignore config
-