- 28 6月, 2013 7 次提交
-
-
由 Junio C Hamano 提交于
* jk/add-i-custom-diff-algo: add -i: add extra options at the right place in "diff" command line add--interactive: respect diff.algorithm
-
由 Junio C Hamano 提交于
The reflog message created when "git cherry-pick" fast-forwarded did not say anything but "cherry-pick", but it now says "cherry-pick: fast-forward". * rr/cherry-pick-fast-forward-reflog-message: sequencer: write useful reflog message for fast-forward
-
由 Junio C Hamano 提交于
Logic used by git-send-email to suppress cc mishandled names that need RFC2047 quoting. * mt/send-email-cc-match-fix: send-email: sanitize author when writing From line send-email: add test for duplicate utf8 name
-
由 Junio C Hamano 提交于
"git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * jk/pull-into-dirty-unborn: pull: merge into unborn by fast-forwarding from empty tree pull: update unborn branch tip after index
-
由 Junio C Hamano 提交于
Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * bc/http-keep-memory-given-to-curl: http.c: don't rewrite the user:passwd string multiple times
-
由 Junio C Hamano 提交于
Plug a small leak in checkout. * bc/checkout-tracking-name-plug-leak: t/t9802: explicitly name the upstream branch to use as a base builtin/checkout.c: don't leak memory in check_tracking_name
-
由 Junio C Hamano 提交于
Finishing touches for the "git rebase --autostash" feature introduced earlier. * rr/rebase-stash-store: rebase: use 'git stash store' to simplify logic stash: introduce 'git stash store' stash: simplify option parser for create stash doc: document short form -p in synopsis stash doc: add a warning about using create
-
- 27 6月, 2013 10 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Fix for the codepath to parse patches that add new files, generated by programs other than Git. THis is an old breakage in v1.7.11 and will need to be merged down to the maintanance tracks. * tr/maint-apply-non-git-patch-parsefix: apply: carefully strdup a possibly-NULL name
-
由 Junio C Hamano 提交于
On Cygwin, recognize "cygstart" as a possible way to start a web browser (used in "help -w" and "instaweb" among others). * ys/cygstart: web--browse: support /usr/bin/cygstart on Cygwin
-
由 Junio C Hamano 提交于
* wk/doc-git-has-grown: user-manual: Update download size for Git and the kernel
-
由 Junio C Hamano 提交于
* vl/typofix: random typofixes (committed missing a 't', successful missing an 's')
-
由 Junio C Hamano 提交于
* ph/builtin-srcs-are-in-subdir-these-days: fix "builtin-*" references to be "builtin/*"
-
由 Junio C Hamano 提交于
* mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes
-
由 Junio C Hamano 提交于
* kb/diff-blob-blob-doc: Documentation: Move "git diff <blob> <blob>"
-
由 Junio C Hamano 提交于
* mm/push-force-is-dangerous: Documentation/git-push.txt: explain better cases where --force is dangerous
-
由 Junio C Hamano 提交于
Many "git submodule" operations do not work on a submodule at a path whose name is not in ASCII. * fg/submodule-non-ascii-path: t7400: test of UTF-8 submodule names pass under Mac OS handle multibyte characters in name
-
- 25 6月, 2013 14 次提交
-
-
由 Junio C Hamano 提交于
For now, comment out the description on two "git status" UI configuration, until the reverted topic can be resurrected. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Recent "rebase --autostash" update made it impossible to recover with "git am --abort" from a repository where "git am" without mbox was run by mistake and then was killed with "^C". * rr/am-quit-empty-then-abort-fix: t/am: use test_path_is_missing() where appropriate am: handle stray $dotest directory
-
由 Junio C Hamano 提交于
* rt/cherry-pick-continue-advice-in-status: wt-status: give better advice when cherry-pick is in progress
-
由 Junio C Hamano 提交于
* nk/config-local-doc: config: Add description of --local option
-
由 Junio C Hamano 提交于
Code cleanup. * jk/mergetool-lib-refactor: mergetool--lib: refactor {diff,merge}_cmd logic
-
由 Junio C Hamano 提交于
Makefile cleanup. * jk/doc-build-move-infordir-def: Documentation/Makefile: move infodir to be with other '*dir's Documentation/Makefile: fix spaces around assignments
-
由 Junio C Hamano 提交于
Code cleanup. * fg/submodule-fixup: git-submodule.sh: remove duplicate call to set_rev_name
-
由 Junio C Hamano 提交于
Allow packaging a tarball in a working tree with $GIT_DIR set elsewhere. * dk/version-gen-gitdir: GIT-VERSION-GEN: support non-standard $GIT_DIR path
-
由 Junio C Hamano 提交于
Fix a test script. * dk/maint-t5150-dirname: tests: allow sha1's as part of the path
-
由 Junio C Hamano 提交于
Code clean-up. * rs/unpack-trees-tree-walk-conflict-field: unpack-trees: don't shift conflicts left and right
-
由 Junio C Hamano 提交于
Allow various commit objects to be given to "git rebase" by ':/look for this string' syntax, e.g. "git rebase --onto ':/there'". * rr/rebase-sha1-by-string-query: rebase: use peel_committish() where appropriate sh-setup: add new peel_committish() helper t/rebase: add failing tests for a peculiar revision
-
由 Junio C Hamano 提交于
Give a single message followed by list of paths from "git rm" to report multiple paths that cannot be removed. * mm/rm-coalesce-errors: rm: introduce advice.rmHints to shorten messages rm: better error message on failure for multiple files
-
由 Junio C Hamano 提交于
Make it possible to call into copy-notes API from the sequencer code. * jh/libify-note-handling: Move create_notes_commit() from notes-merge.c into notes-utils.c Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c finish_copy_notes_for_rewrite(): Let caller provide commit message
-
由 Junio C Hamano 提交于
Plug a small leak in an error codepath. * fc/sequencer-plug-leak: sequencer: avoid leaking message buffer when refusing to create an empty commit sequencer: remove useless indentation
-
- 24 6月, 2013 9 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit 1a22bd31, reversing changes made to 3e7a5b48. It makes it impossible to "git commit" when status.short is set, and also "git status --porcelain" output is affected by status.branch.
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* mz/rebase-tests: rebase topology tests: fix commit names on case-insensitive file systems tests: move test for rebase messages from t3400 to t3406 t3406: modernize style add tests for rebasing merged history add tests for rebasing root add tests for rebasing of empty commits add tests for rebasing with patch-equivalence present add simple tests of consistency across rebase types
-
由 Junio C Hamano 提交于
* jk/unpack-entry-fallback-to-another: unpack_entry: do not die when we fail to apply a delta t5303: drop "count=1" from corruption dd
-
由 Junio C Hamano 提交于
* jk/apache-test-for-2.4: lib-httpd/apache.conf: check version only after mod_version loads t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 t/lib-httpd/apache.conf: load compat access module in apache 2.4 t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
-
由 Junio C Hamano 提交于
* cm/remote-mediawiki-perlcritique: (31 commits) git-remote-mediawiki: make error message more precise git-remote-mediawiki: add a perlcritic rule in Makefile git-remote-mediawiki: add a .perlcriticrc file git-remote-mediawiki: clearly rewrite double dereference git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki") git-remote-mediawiki: put non-trivial numeric values in constants. git-remote-mediawiki: don't use quotes for empty strings git-remote-mediawiki: replace "unless" statements with negated "if" statements git-remote-mediawiki: brace file handles for print for more clarity git-remote-mediawiki: modify strings for a better coding-style git-remote-mediawiki: put long code into a subroutine git-remote-mediawiki: remove import of unused open2 git-remote-mediawiki: check return value of open git-remote-mediawiki: assign a variable as undef and make proper indentation git-remote-mediawiki: rename a variable ($last) which has the name of a keyword git-remote-mediawiki: remove unused variable $entry git-remote-mediawiki: turn double-negated expressions into simple expressions git-remote-mediawiki: change the name of a variable git-remote-mediawiki: add newline in the end of die() error messages git-remote-mediawiki: change style in a regexp ...
-
由 Junio C Hamano 提交于
* bp/remote-mw-tests: git-remote-mediawiki: remove hardcoded version number in the test suite
-
由 Junio C Hamano 提交于
* rr/rebase-autostash: rebase: finish_rebase() in noop rebase rebase: finish_rebase() in fast-forward rebase rebase: guard against missing files in read_basic_state()
-
由 Junio C Hamano 提交于
* rr/prompt-rebase-breakage-fix: prompt: squelch error output from cat
-