Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Revert "Merge branch 'cb/maint-quiet-push' into maint" This reverts commit ffa69e61d3c5730bd4b65a465efc130b0ef3c7df, reversing changes made to 4a13c4d14841343d7caad6ed41a152fee550261d. 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 mechanis…
Junio C Hamano
Update draft release notes to 1.7.7 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'js/i18n-scripts-2' * js/i18n-scripts-2: bisect: take advantage of gettextln, eval_gettextln.
Junio C Hamano
Merge branch 'tr/maint-t3903-misquoted-command' * tr/maint-t3903-misquoted-command: t3903: fix misquoted rev-parse invocation
Junio C Hamano
Merge branch 'bc/bisect-test-use-shell-path' * bc/bisect-test-use-shell-path: t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
Junio C Hamano
Merge branch 'va/p4-branch-import-test-update' * va/p4-branch-import-test-update: git-p4: simple branch tests edits
Junio C Hamano
Merge branch 'tr/maint-strbuf-grow-nul-termination' * tr/maint-strbuf-grow-nul-termination: strbuf_grow(): maintain nul-termination even for new buffer
Junio C Hamano
Merge branch 'tr/maint-ident-to-git-memmove' * tr/maint-ident-to-git-memmove: Use memmove in ident_to_git
Junio C Hamano
Merge branch 'tr/maint-format-patch-empty-output' * 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
Merge branch 'gb/maint-am-stgit-author-to-from-fix' * gb/maint-am-stgit-author-to-from-fix: am: fix stgit patch mangling
Junio C Hamano
Merge branch 'gb/maint-am-patch-format-error-message' * gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch Conflicts: git-am.sh
Junio C Hamano
Merge branch 'ms/daemon-timeout-is-in-seconds' * ms/daemon-timeout-is-in-seconds: git-daemon.txt: specify --timeout in seconds
Junio C Hamano
Merge branch 'bg/t5540-osx-grep' * bg/t5540-osx-grep: t5540-http-test: shorten grep pattern
Junio C Hamano
Merge branch 'jc/clean-exclude-doc' * jc/clean-exclude-doc: Documentation: clarify "git clean -e <pattern>"
Junio C Hamano
Merge branch 'mg/maint-notes-C-doc' * mg/maint-notes-C-doc: git-notes.txt: clarify -C vs. copy and -F
Junio C Hamano
Merge branch 'fg/submodule-ff-check-before-push' * fg/submodule-ff-check-before-push: push: Don't push a repository with unpushed submodules
Junio C Hamano
Merge branch 'rc/diff-cleanup-records' * rc/diff-cleanup-records: xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
Junio C Hamano
Merge branch 'fk/use-kwset-pickaxe-grep-f' * 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
Merge branch 'en/merge-recursive-2' * 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 'r…
Matthieu Moy
(short) documentation for the testgit remote helper While it's not a command meant to be used by actual users (hence, not mentionned in git(1)), this command is a very precious help for remote-helpers authors. The best place for such technical doc is the source code, but users may not find it without a link in a manpage. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Ham…
Matthieu Moy
Documentation/git-remote-helpers: explain how import works with multiple refs This is important for two reasons: * when two "import" lines follow each other, only one "done" command should be issued in the fast-import stream, not one per "import". * The blank line terminating an import command should not be confused with the one terminating the sequence of commands. While we're there, illustrate the corresponding explanation for push batches with an example. Signed-…
Bryan Jacobs
git-svn: Teach dcommit --mergeinfo to handle multiple lines "svn dcommit --mergeinfo" replaces the svn:mergeinfo property in an upstream SVN repository with the given text. The svn:mergeinfo property may contain commits originating on multiple branches, separated by newlines. Cause space characters in the mergeinfo to be replaced by newlines, allowing a user to create history representing multiple branches being merged into one. Update the corresponding …
Eric Wong
git-svn: fix fetch with moved path when using rewriteRoot The matching step in commit 3235b7053c45a734c1cdf9b117bda68b7ced29c9 did not properly account for users of the "rewriteRoot" configuration parameter. ref: <CANWsHyfHtr0EaJtNsDK9UTcmb_AbLg-1jUA-0uWJ-nEeNosb7w@mail.gmail.com> Suggested-by: H Krishnan <hetchkay@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
Ray Chen
git-svn: New flag to emulate empty directories Adds a --preserve-empty-dirs flag to the clone operation that will detect empty directories in the remote Subversion repository and create placeholder files in the corresponding local Git directories. This allows "empty" directories to exist in the history of a Git repository. Also adds the --placeholder-file flag to control the name of any placeholder files created. Default value is ".gitignor…
Tay Ray Chuan
xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() Ensure that the xdl_free_classifier() call on xdlclassifier_t cf is safe even if xdl_init_classifier() isn't called. This may occur in the case where diff is run with --histogram and a call to, say, xdl_prepare_ctx() fails. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh Some platforms (IRIX, Solaris) provide an ancient /bin/sh which chokes on modern shell syntax like $(). SHELL_PATH is provided to allow the user to specify a working sh, let's use it here. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jon Seymour
bisect: take advantage of gettextln, eval_gettextln. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: Documentation: clarify effects of -- <path> arguments
Thomas Rast
t3903: fix misquoted rev-parse invocation !"git ..." hopefully always succeeds because "git ..." is not the name of any executable. However, that's not what was intended. Unquote it, and while we're at it, also replace ! with test_must_fail since it is a call to git. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
Documentation: clarify effects of -- <path> arguments 'git log -- <path>' does not "show commits that affect the specified paths" in a literal sense unless --full-history is given (for example, a file that only existed on a side branch will turn up no commits at all!). Reword it to specify the actual intent of the filtering, and point to the "History Simplification" section. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C …
  1. Prev
  2. Next