- 13 9月, 2011 1 次提交
-
-
由 Junio C Hamano 提交于
* jn/remote-helpers-doc: (short) documentation for the testgit remote helper Documentation/git-remote-helpers: explain how import works with multiple refs Documentation/remote-helpers: explain capabilities first
-
- 12 9月, 2011 12 次提交
-
-
由 Junio C Hamano 提交于
* maint: Prepare for 1.7.6.3 maintenance release SubmittingPathces: remove Cogito reference Conflicts: RelNotes
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ms/reflog-show-is-default: reflog: actually default to subcommand 'show'
-
由 Junio C Hamano 提交于
* jk/reset-reflog-message-fix: reset: give better reflog messages
-
由 Junio C Hamano 提交于
* vi/make-test-vector-less-specific: tests: cleanup binary test vector files
-
由 Junio C Hamano 提交于
* 'jk/tag-contains-ab' (early part): tag: speed up --contains calculation
-
由 Junio C Hamano 提交于
* dz/connect-error-report: Do not log unless all connect() attempts fail
-
由 Junio C Hamano 提交于
* jc/maint-mergetool-read-fix: mergetool: check return value from read
-
由 Junio C Hamano 提交于
* jk/maint-config-param: config: use strbuf_split_str instead of a temporary strbuf strbuf: allow strbuf_split to work on non-strbufs config: avoid segfault when parsing command-line config config: die on error in command-line config fix "git -c" parsing of values with equals signs strbuf_split: add a max parameter
-
由 Junio C Hamano 提交于
* jn/doc-dashdash: Documentation/i18n: quote double-dash for AsciiDoc Documentation: quote double-dash for AsciiDoc Conflicts: Documentation/git-mergetool--lib.txt
-
由 Junio C Hamano 提交于
* jk/maint-1.7.2-status-ignored: git status --ignored: tests and docs status: fix bug with missing --ignore files Conflicts: Documentation/git-status.txt t/t7508-status.sh
-
由 Sverre Rabbelier 提交于
Removing Cogito leaves just git and StGit, which is a rather incomplete list of git diff tools available. Sidestep the problem of deciding what tools to mention by not mentioning any. Signed-off-by: NSverre Rabbelier <srabbelier@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 9月, 2011 2 次提交
-
-
由 Michael J Gruber 提交于
Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
A few more parts of this document is stale that needs updating to reflect the reality, but I do not regularly rebase topics that are only in "pu" anymore, which may be noteworthy for a commit. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 9月, 2011 7 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* rc/histogram-diff: xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
-
由 Junio C Hamano 提交于
* cb/maint-ls-files-error-report: t3005: do not assume a particular order of stdout and stderr of git-ls-files
-
由 Junio C Hamano 提交于
* mh/check-ref-format-print-normalize: Forbid DEL characters in reference names check-ref-format --print: Normalize refnames that start with slashes
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
This reverts commit ffa69e61, reversing changes made to 4a13c4d1. Adding a new command line option to receive-pack and feed it from send-pack is not an acceptable way to add features, as there is no guarantee that your updated send-pack will be talking to updated receive-pack. New features need to be added via the capability mechanism negotiated over the protocol. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 9月, 2011 18 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* js/i18n-scripts-2: bisect: take advantage of gettextln, eval_gettextln.
-
由 Junio C Hamano 提交于
* tr/maint-t3903-misquoted-command: t3903: fix misquoted rev-parse invocation
-
由 Junio C Hamano 提交于
* bc/bisect-test-use-shell-path: t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
-
由 Junio C Hamano 提交于
* va/p4-branch-import-test-update: git-p4: simple branch tests edits
-
由 Junio C Hamano 提交于
* tr/maint-strbuf-grow-nul-termination: strbuf_grow(): maintain nul-termination even for new buffer
-
由 Junio C Hamano 提交于
* tr/maint-ident-to-git-memmove: Use memmove in ident_to_git
-
由 Junio C Hamano 提交于
* tr/maint-format-patch-empty-output: Document negated forms of format-patch --to --cc --add-headers t4014: "no-add-headers" is actually called "no-add-header" t4014: invoke format-patch with --stdout where intended t4014: check for empty files from git format-patch --stdout
-
由 Junio C Hamano 提交于
* gb/maint-am-stgit-author-to-from-fix: am: fix stgit patch mangling
-
由 Junio C Hamano 提交于
* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch Conflicts: git-am.sh
-
由 Junio C Hamano 提交于
* ms/daemon-timeout-is-in-seconds: git-daemon.txt: specify --timeout in seconds
-
由 Junio C Hamano 提交于
* bg/t5540-osx-grep: t5540-http-test: shorten grep pattern
-
由 Junio C Hamano 提交于
* jc/clean-exclude-doc: Documentation: clarify "git clean -e <pattern>"
-
由 Junio C Hamano 提交于
* mg/maint-notes-C-doc: git-notes.txt: clarify -C vs. copy and -F
-
由 Junio C Hamano 提交于
* fg/submodule-ff-check-before-push: push: Don't push a repository with unpushed submodules
-
由 Junio C Hamano 提交于
* rc/diff-cleanup-records: xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
-
由 Junio C Hamano 提交于
* fk/use-kwset-pickaxe-grep-f: obstack: Fix portability issues Use kwset in grep Use kwset in pickaxe Adapt the kwset code to Git Add string search routines from GNU grep Add obstack.[ch] from EGLIBC 2.10
-
由 Junio C Hamano 提交于
* en/merge-recursive-2: (57 commits) merge-recursive: Don't re-sort a list whose order we depend upon merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify merge-recursive: Avoid unnecessary file rewrites t6022: Additional tests checking for unnecessary updates of files merge-recursive: Fix spurious 'refusing to lose untracked file...' messages t6022: Add testcase for spurious "refusing to lose untracked" messages t3030: fix accidental success in symlink rename merge-recursive: Fix working copy handling for rename/rename/add/add merge-recursive: add handling for rename/rename/add-dest/add-dest merge-recursive: Have conflict_rename_delete reuse modify/delete code merge-recursive: Make modify/delete handling code reusable merge-recursive: Consider modifications in rename/rename(2to1) conflicts merge-recursive: Create function for merging with branchname:file markers merge-recursive: Record more data needed for merging with dual renames merge-recursive: Defer rename/rename(2to1) handling until process_entry merge-recursive: Small cleanups for conflict_rename_rename_1to2 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base merge-recursive: Introduce a merge_file convenience function merge-recursive: Fix modify/delete resolution in the recursive case ...
-