- 02 12月, 2010 8 次提交
-
-
由 Junio C Hamano 提交于
* maint: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--"
-
由 Junio C Hamano 提交于
* maint-1.7.2: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--"
-
由 Junio C Hamano 提交于
* maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors
-
由 Junio C Hamano 提交于
* maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors
-
由 Jonathan Nieder 提交于
The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add a config option to ignore errors for git-add, 2008-05-12) does not follow the usual convention for naming values in the git configuration file. What convention? Glad you asked. The section name indicates the affected subsystem. The subsection name, if any, indicates which of an unbound set of things to set the value for. The variable name describes the effect of tweaking this knob. The section and variable names can be broken into words using bumpyCaps in documentation as a hint to the reader. These word breaks are not significant at the level of code, since the section and variable names are not case sensitive. The name "add.ignore-errors" includes a dash, meaning a naive configuration file like [add] ignoreErrors does not have any effect. Avoid such confusion by renaming to the more consistent add.ignoreErrors, but keep the old version for backwards compatibility. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ralf Thielow 提交于
Bad graft data is noticed in several places in read_graft_line(), and in each case we go back to the first site of detection. It in general is a better style to have an exception handling out of line from the main codepath and make error codepath jump forward. Signed-off-by: NRalf Thielow <ralf.thielow@googlemail.com> Reviewed-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 knittl 提交于
The bash prompt would display a commit's object name when having checked out a lightweight tag. Provide `--tags` to `git describe` in the completion script, so it will display lightweight tag names, as it already does for annotated tags. Signed-off-by: NDaniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jari Aalto 提交于
All options, including -i and -o, must come before "--" which is the end of options marker. Reported-by: NJoey Hess <joey@kitenet.net> Signed-off-by: NJari Aalto <jari.aalto@cante.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 30 11月, 2010 16 次提交
-
-
由 Junio C Hamano 提交于
* cb/leading-path-removal: use persistent memory for rejected paths do not overwrite files in leading path lstat_cache: optionally return match_len add function check_ok_to_remove() t7607: add leading-path tests t7607: use test-lib functions and check MERGE_HEAD Conflicts: t/t7607-merge-overwrite.sh
-
由 Junio C Hamano 提交于
* en/merge-recursive: (41 commits) t6022: Use -eq not = to test output of wc -l merge-recursive:make_room_for_directories - work around dumb compilers merge-recursive: Remove redundant path clearing for D/F conflicts merge-recursive: Make room for directories in D/F conflicts handle_delete_modify(): Check whether D/F conflicts are still present merge_content(): Check whether D/F conflicts are still present conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts conflict_rename_delete(): Check whether D/F conflicts are still present merge-recursive: Delay modify/delete conflicts if D/F conflict present merge-recursive: Delay content merging for renames merge-recursive: Delay handling of rename/delete conflicts merge-recursive: Move handling of double rename of one file to other file merge-recursive: Move handling of double rename of one file to two merge-recursive: Avoid doubly merging rename/add conflict contents merge-recursive: Update merge_content() call signature merge-recursive: Update conflict_rename_rename_1to2() call signature merge-recursive: Structure process_df_entry() to handle more cases merge-recursive: Have process_entry() skip D/F or rename entries merge-recursive: New function to assist resolving renames in-core only merge-recursive: New data structures for deferring of D/F conflicts ... Conflicts: t/t6020-merge-df.sh t/t6036-recursive-corner-cases.sh
-
由 Junio C Hamano 提交于
* jl/clone-recurse-sm-synonym: clone: Add the --recurse-submodules option as alias for --recursive
-
由 Junio C Hamano 提交于
* jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
-
由 Junio C Hamano 提交于
* jc/emfile: A loose object is not corrupt if it cannot be read due to EMFILE read_sha1_file(): report correct name of packfile with a corrupt object
-
由 Junio C Hamano 提交于
* md/interix: Interix: add configure checks add support for the SUA layer (interix; windows) Conflicts: git-compat-util.h
-
由 Junio C Hamano 提交于
* jl/add-p-reverse-message: Correct help blurb in checkout -p and friends
-
由 Junio C Hamano 提交于
* np/pack-broken-boundary: make pack-objects a bit more resilient to repo corruption
-
由 Junio C Hamano 提交于
* np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing
-
由 Junio C Hamano 提交于
* fc/apply-p2-get-header-name: test: git-apply -p2 rename/chmod only Fix git-apply with -p greater than 1
-
由 Junio C Hamano 提交于
* jn/fast-import-fix: fast-import: do not clear notes in do_change_note_fanout() t9300 (fast-import): another test for the "replace root" feature fast-import: tighten M 040000 syntax fast-import: filemodify after M 040000 <tree> "" crashes
-
由 Junio C Hamano 提交于
* rr/needs-clean-work-tree: Porcelain scripts: Rewrite cryptic "needs update" error message
-
由 Junio C Hamano 提交于
* kb/blame-author-email: blame: Add option to show author email instead of name Conflicts: t/annotate-tests.sh
-
由 Junio C Hamano 提交于
* cm/diff-check-at-eol: diff --check: correct line numbers of new blank lines at EOF
-
由 Junio C Hamano 提交于
* ak/apply-non-git-epoch: apply: handle patches with funny filename and colon in timezone apply: Recognize epoch timestamps with : in the timezone
-
由 Junio C Hamano 提交于
* tc/smart-http-post-redirect: smart-http: Don't change POST to GET when following redirect
-
- 27 11月, 2010 2 次提交
-
-
由 Junio C Hamano 提交于
* en/and-cascade-tests: t7300: add a missing SYMLINKS prerequisite
-
由 Johannes Sixt 提交于
The test fails on Windows since 2dec68cf (tests: add missing &&, batch 2). Even though this test allocates and leaves behind files, subsequent tests do not depend on this, so it is safe to just skip it. Signed-off-by: NJohannes Sixt <j6t@kdbg.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 25 11月, 2010 14 次提交
-
-
由 Junio C Hamano 提交于
* cb/maint-orphan-merge-noclobber: do not overwrite untracked during merge from unborn branch
-
由 Junio C Hamano 提交于
* ao/send-email-irt: git-send-email.perl: make initial In-Reply-To apply only to first email t9001: send-email interation with --in-reply-to and --chain-reply-to
-
由 Junio C Hamano 提交于
* jk/add-e-doc: docs: give more hints about how "add -e" works docs: give more hints about how "add -e" works
-
由 Junio C Hamano 提交于
* rs/opt-help-text: verify-tag: document --verbose branch: improve --verbose description archive: improve --verbose description Describe various forms of "be quiet" using OPT__QUIET add OPT__FORCE add description parameter to OPT__QUIET add description parameter to OPT__DRY_RUN add description parameter to OPT__VERBOSE
-
由 Junio C Hamano 提交于
* kb/maint-rebase-autosquash: rebase: teach --autosquash to match on sha1 in addition to message rebase: better rearranging of fixup!/squash! lines with --autosquash
-
由 Junio C Hamano 提交于
* mm/phrase-remote-tracking: git-branch.txt: mention --set-upstream as a way to change upstream configuration user-manual: remote-tracking can be checked out, with detached HEAD user-manual.txt: explain better the remote(-tracking) branch terms Change incorrect "remote branch" to "remote tracking branch" in C code Change incorrect uses of "remote branch" meaning "remote-tracking" Change "tracking branch" to "remote-tracking branch" everyday.txt: change "tracking branch" to "remote-tracking branch" Change remote tracking to remote-tracking in non-trivial places Replace "remote tracking" with "remote-tracking" Better "Changed but not updated" message in git-status
-
由 Junio C Hamano 提交于
* en/and-cascade-tests: (25 commits) t4124 (apply --whitespace): use test_might_fail t3404: do not use 'describe' to implement test_cmp_rev t3404 (rebase -i): introduce helper to check position of HEAD t3404 (rebase -i): move comment to description t3404 (rebase -i): unroll test_commit loops t3301 (notes): use test_expect_code for clarity t1400 (update-ref): use test_must_fail t1502 (rev-parse --parseopt): test exit code from "-h" t6022 (renaming merge): chain test commands with && test-lib: introduce test_line_count to measure files tests: add missing &&, batch 2 tests: add missing && Introduce sane_unset and use it to ensure proper && chaining t7800 (difftool): add missing && t7601 (merge-pull-config): add missing && t7001 (mv): add missing && t6016 (rev-list-graph-simplify-history): add missing && t5602 (clone-remote-exec): add missing && t4026 (color): remove unneeded and unchained command t4019 (diff-wserror): add lots of missing && ... Conflicts: t/t7006-pager.sh
-
由 Junio C Hamano 提交于
* maint: imap-send: link against libcrypto for HMAC and others git-send-email.perl: Deduplicate "to:" and "cc:" entries with names mingw: do not set errno to 0 on success
-
由 Junio C Hamano 提交于
* jl/maint-pull-tags-doc: pull: Remove --tags option from manpage
-
由 Junio C Hamano 提交于
* kb/maint-diff-ws-check: diff: handle lines containing only whitespace and tabs better test-lib: extend test_decode_color to handle more color codes
-
由 Junio C Hamano 提交于
* jm/mailmap: t4203: do not let "git shortlog" DWIM based on tty t4203 (mailmap): stop hardcoding commit ids and dates mailmap: fix use of freed memory
-
由 Junio C Hamano 提交于
* tr/maint-git-repack-tmpfile: repack: place temporary packs under .git/objects/pack/
-
由 Junio C Hamano 提交于
* jk/maint-apply-no-binary: apply: don't segfault on binary files with missing data
-
由 Junio C Hamano 提交于
* jn/send-pack-error: send-pack: avoid redundant "pack-objects died with strange error"
-