- 07 12月, 2010 1 次提交
-
-
由 Santi Béjar 提交于
get_remote_merge_branch with zero or one arguments returns the upstream branch. But a detached HEAD does no have an upstream branch, as it is not tracking anything. Handle this case testing the exit code of "git symbolic-ref -q HEAD". Reported-by: NSverre Rabbelier <srabbelier@gmail.com> Signed-off-by: NSanti Béjar <santi@agolina.net> Tested-by: NSverre Rabbelier <srabbelier@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 12月, 2010 12 次提交
-
-
由 Junio C Hamano 提交于
* jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections
-
由 Junio C Hamano 提交于
* kb/maint-status-cquote: status: Quote paths with spaces in short format
-
由 Junio C Hamano 提交于
* jn/thinner-wrapper: Remove pack file handling dependency from wrapper.o pack-objects: mark file-local variable static wrapper: give zlib wrappers their own translation unit strbuf: move strbuf_branchname to sha1_name.c path helpers: move git_mkstemp* to wrapper.c wrapper: move odb_* to environment.c wrapper: move xmmap() to sha1_file.c
-
由 Junio C Hamano 提交于
* pn/commit-autosquash: add tests of commit --squash commit: --squash option for use with rebase --autosquash add tests of commit --fixup commit: --fixup option for use with rebase --autosquash pretty.c: teach format_commit_message() to reencode the output commit: helper methods to reduce redundant blocks of code Conflicts: Documentation/git-commit.txt t/t3415-rebase-autosquash.sh
-
由 Junio C Hamano 提交于
* sn/diff-doc: docs: clarify git diff modes of operation diff,difftool: Don't use the {0,2} notation in usage strings CodingGuidelines: Add a section on writing documentation
-
由 Junio C Hamano 提交于
* sp/emfile: Work around EMFILE when there are too many pack files Use git_open_noatime when accessing pack data
-
由 Junio C Hamano 提交于
* jc/abbrev-guard: core.abbrevguard: Ensure short object names stay unique a bit longer
-
由 Junio C Hamano 提交于
* jj/icase-directory: Support case folding in git fast-import when core.ignorecase=true Support case folding for git add when core.ignorecase=true Add case insensitivity support when using git ls-files Add case insensitivity support for directories when using git status Case insensitivity support for .gitignore via core.ignorecase Add string comparison functions that respect the ignore_case variable. Makefile & configure: add a NO_FNMATCH_CASEFOLD flag Makefile & configure: add a NO_FNMATCH flag Conflicts: Makefile config.mak.in configure.ac fast-import.c
-
由 Junio C Hamano 提交于
* maint: Git 1.7.3.3 CodingGuidelines: mention whitespace preferences for shell scripts Documentation: do not misinterpret pull refspec as bold text Conflicts: Documentation/git-pull.txt RelNotes
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Giuseppe Bilotta 提交于
Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jonathan Nieder 提交于
Use the {asterisk} entity to avoid mistreating the asterisks in "(e.g., refs/heads/*:refs/remotes/origin/*)" as delimiters for bold text. From a quick search with 'git grep -e "\*.*\*"', this seems to be the last example of this particular formatting problem. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 12月, 2010 13 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Git 1.7.0.8 Documentation: Fix mark-up of lines with more than one tilde Conflicts: GIT-VERSION-GEN
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
The manual pages of cherry-pick and revert had examples with two revisions on the same line in the examples section, that looked like this: git cherry-pick master~4 master~2:: Unfortunately, this is taken as a mark-up to make the part between two tildes, "4 master", subscript. Use {tilde} to make it explicit that we do want ~ characters in these places (backslash does not help). Reported-by: NSylvain Rabot <sylvain.rabot@f-secure.com> Helped-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* cb/maint-orphan-merge-noclobber: do not overwrite untracked during merge from unborn branch
-
由 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 提交于
* bg/maint-gitweb-test-lib: t/gitweb-lib: Don't pass constant to decode_utf8
-
由 Junio C Hamano 提交于
* tr/maint-merge-file-subdir: merge-file: correctly find files when called in subdir prefix_filename(): safely handle the case where pfx_len=0
-
由 Junio C Hamano 提交于
* ks/no-textconv-symlink: blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
-
由 Junio C Hamano 提交于
* bc/fortran-userdiff: userdiff.c: add builtin fortran regex patterns
-
- 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 6 次提交
-
-
由 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
-