Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.0
Junio C Hamano
Merge branch 'maint' * maint: Fix typo in 1.6.6.2 release notes Re-fix check-ref-format documentation mark-up
Junio C Hamano
Fix typo in 1.6.6.2 release notes Of course, these are changes since 1.6.6.1; changes since 1.6.6.2 would have been nil. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Re-fix check-ref-format documentation mark-up It is not double-backslash we forbid; backslashes are forbidden since a4c2e699 (Disallow '\' in ref names, 2009-05-08) Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
archive documentation: attributes are taken from the tree by default By default, git-archive takes attributes from the tree being archived. People however often wonder why their attempts to affect the way how the command archives their tree by changing .gitattributes in their work tree fail. Add a bit of explanatory note to tell them how to achieve what they want to do. Noticed-by: Francois Marier Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
Documentation: minor fixes to RelNotes-1.7.0 Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor
bash: support 'git am's new '--continue' option Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: filter-branch: Fix error message for --prune-empty --commit-filter
Jacob Helwig
filter-branch: Fix error message for --prune-empty --commit-filter Running filter-branch with --prune-empty and --commit-filter reports: "Cannot set --prune-empty and --filter-commit at the same time". Change it to use the correct option name: --commit-filter Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
am: switch --resolved to --continue Rebase calls this same function "--continue", which means users may be trained to type it. There is no reason to deprecate --resolved (or -r), so we will keep it as a synonym. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.0 one more time Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.6.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.6.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.6.2
Junio C Hamano
Merge branch 'maint-1.6.5' into maint * maint-1.6.5: t8003: check exit code of command and error message separately
Junio C Hamano
t8003: check exit code of command and error message separately Shell reports exit status only from the most downstream command in a pipeline. In these tests, we want to make sure that the command fails in a controlled way, and produces a correct error message. This issue was known by Jay who submitted the patch, and also was pointed out by Hannes during the review process, but I forgot to fix it up before applying. Sorry about that. Signed-off-by: Junio C…
Junio C Hamano
Merge branch 'sp/maint-fast-import-large-blob' into maint * sp/maint-fast-import-large-blob: fast-import: Stream very large blobs directly to pack
Junio C Hamano
Merge branch 'gp/maint-cvsserver' into maint * gp/maint-cvsserver: git-cvsserver: allow regex metacharacters in CVSROOT
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp' into maint * jc/maint-reflog-bad-timestamp: t0101: use a fixed timestamp when searching in the reflog Update @{bogus.timestamp} fix not to die() approxidate_careful() reports errorneous date string
Junio C Hamano
Merge branch 'il/maint-xmallocz' into maint * il/maint-xmallocz: Fix integer overflow in unpack_compressed_entry() Fix integer overflow in unpack_sha1_rest() Fix integer overflow in patch_delta() Add xmallocz()
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix' into maint * jh/maint-config-file-prefix: builtin-config: Fix crash when using "-f <relative path>" from non-root dir
Junio C Hamano
Merge branch 'nd/include-termios-for-osol' into maint * nd/include-termios-for-osol: Add missing #include to support TIOCGWINSZ on Solaris
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint * jc/maint-1.6.1-checkout-m-custom-merge: checkout -m path: fix recreating conflicts Conflicts: t/t7201-co.sh
Junio C Hamano
Merge branch 'rs/maint-archive-match-pathspec' into maint * rs/maint-archive-match-pathspec: archive: complain about path specs that don't match anything
Junio C Hamano
check-ref-format documentation: fix enumeration mark-up The last item in the enumerated refname rule was mistakenly made into a sub-item of the 7th one. It should be the 8th one in the list on its own. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
Documentation: quote braces in {upstream} notation The lack of quoting made the entire line disappear. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Gernhardt
t3902: Protect against OS X normalization 8424981: "Fix invalid read in quote_c_style_counted" introduced a test that used "caractère spécial" as a directory name. Git creates it as "caract\303\250re sp\303\251cial" OS X stores it as "caracte\314\200re spe\314\201cial" To work around this problem, use the already introduced $FN as the directory name. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Ha…
Junio C Hamano
Merge branch 'maint' * maint: blame: prevent a segv when -L given start > EOF git-push: document all the status flags used in the output Fix parsing of imap.preformattedHTML and imap.sslverify git-add documentation: Fix shell quoting example
Junio C Hamano
Merge branch 'maint-1.6.5' into maint * maint-1.6.5: blame: prevent a segv when -L given start > EOF
Jay Soffian
blame: prevent a segv when -L given start > EOF blame would segv if given -L <lineno> with <lineno> past the end of the file. While we're fixing the bug, add test cases for an invalid <start> when called as -L <start>,<end> or -L<start>. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/maint-push-doc-status' into maint * jc/maint-push-doc-status: git-push: document all the status flags used in the output
  1. Prev
  2. Next