Commits

Show all
Author Commit Message Labels Comments Date
Mischa POSLAWSKY
git-jump: ignore (custom) prefix in diff mode Matching the default file prefix b/ does not yield any results if config option diff.noprefix or diff.mnemonicprefix is enabled. Signed-off-by: Mischa POSLAWSKY <git@shiar.nl> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Wesley J. Landaker
Documentation: indent-with-non-tab uses "equivalent tabs" not 8 Update the documentation of the core.whitespace option "indent-with-non-tab" to correctly reflect that it catches the use of spaces instead of the equivalent tabs, rather than a fixed number. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Yacine Belkadi
completion: add --no-edit to git-commit Signed-off-by: Yacine Belkadi <yacine.belkadi.1@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
t7810-grep: test --all-match with multiple --grep and --author options The code used to have a bug that ignores "--all-match", that requires all "--grep" to have matched, when "--author" or "--committer" was used. Make sure the bug will not be reintroduced. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
t7810-grep: test interaction of multiple --grep and --author options There are tests for this interaction already. Restructure slightly and avoid any claims about --all-match. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
t7810-grep: test multiple --author with --all-match The "--all-match" option is about "--grep", and does not affect how "--author" or "--committer" limitation is applied. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
t7810-grep: test multiple --grep with and without --all-match Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
t7810-grep: bring log --grep tests in common form The log --grep tests generate the expected out in different ways. Make them all use command blocks so that subshells are avoided and the expected output is easier to grasp visually. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
grep.c: mark private file-scope symbols as static Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Draft release notes to 1.7.12.1 We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'sb/send-email-reconfirm-fix' into maint * sb/send-email-reconfirm-fix: send-email: initial_to and initial_reply_to are both optional
Junio C Hamano
Merge branch 'jc/send-email-reconfirm' into maint * jc/send-email-reconfirm: send-email: validate & reconfirm interactive responses
Junio C Hamano
Merge branch 'mz/cherry-pick-cmdline-order' into maint * mz/cherry-pick-cmdline-order: cherry-pick/revert: respect order of revisions to pick demonstrate broken 'git cherry-pick three one two' teach log --no-walk=unsorted, which avoids sorting
Junio C Hamano
Sync with 1.7.11.7
Junio C Hamano
Git 1.7.11.7 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.11.7
Junio C Hamano
Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11 * jk/maint-quiet-is-synonym-to-s-in-log: log: fix --quiet synonym for -s
Junio C Hamano
Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11 * jc/maint-ident-missing-human-name: split_ident_line(): make best effort when parsing author/committer line
Junio C Hamano
Merge branch 'rj/test-regex' into maint-1.7.11 * rj/test-regex: test-regex: Add a test to check for a bug in the regex routines
Junio C Hamano
Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11 * da/gitk-reload-tag-contents: gitk: Rename 'tagcontents' to 'cached_tagcontent' gitk: Teach "Reread references" to reload tags gitk: Avoid Meta1-F5
Junio C Hamano
Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11 * jc/maint-checkout-fileglob-doc: gitcli: contrast wildcard given to shell and to git gitcli: formatting fix Document file-glob for "git checkout -- '*.c'"
Junio C Hamano
log: document use of multiple commit limiting options Generally speaking, using more options will further narrow the selection, but there are a few exceptions. Document them. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
log --grep/--author: honor --all-match honored for multiple --grep patterns When we have both header expression (which has to be an OR node by construction) and a pattern expression (which could be anything), we create a new top-level OR node to bind them together, and the resulting expression structure looks like this: OR / \ / \ pattern OR / \ / \ ..... committer OR …
Michael J Gruber
grep: show --debug output only once When threaded grep is in effect, the patterns are duplicated and recompiled for each thread. Avoid "--debug" output during the recompilation so that the output is given once instead of "1+nthreads" times. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
grep: teach --debug option to dump the parse tree Our "grep" allows complex boolean expressions to be formed to match each individual line with operators like --and, '(', ')' and --not. Introduce the "--debug" option to show the parse tree to help people who want to debug and enhance it. Also "log" learns "--grep-debug" option to do the same. The command line parser to the log family is a lot more limited than the general "git grep" parser, but…
Nguyễn Thái Ngọc Duy
Revert diffstat back to English This reverts the i18n part of 7f81463 (Use correct grammar in diffstat summary line - 2012-02-01) but still keeps the grammar correctness for English. It also reverts b354f11 (Fix tests under GETTEXT_POISON on diffstat - 2012-08-27). The result is diffstat always in English for all commands. This helps stop users from accidentally sending localized format-patch'd patches. Signed-off-by: Nguyễn T…
Junio C Hamano
attr: failure to open a .gitattributes file is OK with ENOTDIR Often we consult an in-tree .gitattributes file that exists per directory. Majority of directories do not usually have such a file, and it is perfectly fine if we cannot open it because there is no such file, but we do want to know when there is an I/O or permission error. Earlier, we made the codepath warn when we fail to open it for reasons other than ENOENT for that reason. We however someti…
Jeremy White
Documentation: describe subject more precisely The discussion of email subject throughout the documentation is misleading; it indicates that the first line will always become the subject. In fact, the subject is generally all lines up until the first full blank line. This patch refines that, and makes more use of the concept of a commit title, with the title being all text up to the first blank line. Signed-off-by: Jeremy White <jwhite@code…
Junio C Hamano
Further merging in preparation for 1.7.12.1 Describe the following in the draft release notes: . jc/apply-binary-p0 . jc/dotdot-is-parent-directory . jc/maint-doc-checkout-b-always-takes-branch-name . jk/maint-http-half-auth-push . kk/maint-for-each-ref-multi-sort Yet to be merged before 1.7.12.1 are: . jk/config-warn-on-inaccessible-paths . jk/maint-quiet-is-synonym-to-s-in-log . mz/cherry-pick-cmdline-order Signed-off-by: Juni…
Junio C Hamano
Merge branch 'maint-1.7.11' into maint
Junio C Hamano
Merge branch 'jc/apply-binary-p0' into maint-1.7.11 "git apply -p0" did not parse pathnames on "diff --git" line correctly. This caused patches that had pathnames in no other places to be mistakenly rejected (most notably, binary patch that does not rename nor change mode). Textual patches, renames or mode changes have preimage and postimage pathnames in different places in a form that can be parsed unambiguously and did not suffer from this prob…
  1. Prev
  2. Next