- 21 11月, 2009 2 次提交
-
-
由 Thomas Rast 提交于
4d23660e (describe: when failing, tell the user about options that work, 2009-10-28) forgot to update the shortcut path where the code detected and used a possible exact match. This means that an unannotated tag on HEAD would be used by 'git describe'. Guard this code path against the new circumstances, where unannotated tags can be present in ->util even if we're not actually planning to use them. While there, also add some tests for --all. Reported by 'yashi' on IRC. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 David Aguilar 提交于
i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5493) compiler (and probably others) mistakenly thinks variable 'right' is used before assigned. Work around it by giving it a fake initialization. Signed-off-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 18 11月, 2009 4 次提交
-
-
由 Junio C Hamano 提交于
* np/maint-sideband-favor-status: give priority to progress messages
-
由 Junio C Hamano 提交于
* sb/tutorial-test: t1200: prepare for merging with Fast-forward bikeshedding t1200: further modernize test script style t1200: Make documentation and test agree t1200: cleanup and modernize test style
-
由 Junio C Hamano 提交于
* ef/msys-imap: Windows: use BLK_SHA1 again MSVC: Enable OpenSSL, and translate -lcrypto mingw: enable OpenSSL mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle imap-send: build imap-send on Windows imap-send: fix compilation-error on Windows imap-send: use run-command API for tunneling imap-send: use separate read and write fds imap-send: remove useless uid code
-
git://git.bogomips.org/git-svn由 Junio C Hamano 提交于
* git://git.bogomips.org/git-svn: Document git-svn's first-parent rule git svn: attempt to create empty dirs on clone+rebase git svn: add authorsfile test case for ~/.gitconfig git svn: read global+system config for clone+init git svn: handle SVN merges from revisions past the tip of the branch
-
- 17 11月, 2009 1 次提交
-
-
由 Thomas Rast 提交于
git-svn has the following rule to detect the SVN base for its operations: find the first git-svn-id line reachable through first-parent ancestry. IOW, git log --grep=^git-svn-id: --first-parent -1 Document this, as it is very important when using merges with git-svn. Signed-off-by: NThomas Rast <trast@student.ethz.ch>
-
- 16 11月, 2009 32 次提交
-
-
由 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 提交于
* bs/maint-pre-commit-hook-sample: pre-commit.sample: Diff against the empty tree when HEAD is invalid
-
由 Junio C Hamano 提交于
* jk/maint-add-p-empty: add-interactive: handle deletion of empty files
-
由 Junio C Hamano 提交于
* js/maint-diff-color-words: diff --color-words: bit of clean-up diff --color-words -U0: fix the location of hunk headers t4034-diff-words: add a test for word diff without context Conflicts: diff.c
-
由 Junio C Hamano 提交于
* tz/maint-rpm: Makefile: Ensure rpm packages can be read by older rpm versions
-
由 Junio C Hamano 提交于
* jk/maint-format-patch-p-suppress-stat: format-patch: make "-p" suppress diffstat
-
由 Junio C Hamano 提交于
* pb/maint-gitweb-blob-lineno: gitweb: Fix blob linenr links in pathinfo mode
-
由 Junio C Hamano 提交于
* jk/maint-1.6.3-ls-files-i: ls-files: unbreak "ls-files -i"
-
由 Junio C Hamano 提交于
* vl/maint-openssl-signature-change: imap-send.c: fix compiler warnings for OpenSSL 1.0
-
由 Junio C Hamano 提交于
* jk/maint-push-config: push: always load default config
-
由 Junio C Hamano 提交于
* sr/blame-incomplete: blame: make sure that the last line ends in an LF
-
由 Junio C Hamano 提交于
* jc/maint-blank-at-eof: diff -B: colour whitespace errors diff.c: emit_add_line() takes only the rest of the line diff.c: split emit_line() from the first char and the rest of the line diff.c: shuffling code around diff --whitespace: fix blank lines at end core.whitespace: split trailing-space into blank-at-{eol,eof} diff --color: color blank-at-eof diff --whitespace=warn/error: fix blank-at-eof check diff --whitespace=warn/error: obey blank-at-eof diff.c: the builtin_diff() deals with only two-file comparison apply --whitespace: warn blank but not necessarily empty lines at EOF apply --whitespace=warn/error: diagnose blank at EOF apply.c: split check_whitespace() into two apply --whitespace=fix: detect new blank lines at eof correctly apply --whitespace=fix: fix handling of blank lines at the eof
-
由 Eric Wong 提交于
We parse unhandled.log files for empty_dir statements and make a best effort attempt to recreate empty directories on fresh clones and rebase. This should cover the majority of cases where users work off a single branch or for projects where branches do not differ in empty directories. Since this cannot affect "normal" git commands like "checkout" or "reset", so users switching between branches in a single working directory should use the new "git svn mkdirs" command after switching branches. Signed-off-by: NEric Wong <normalperson@yhbt.net>
-
由 Junio C Hamano 提交于
* maint:
-
由 Junio C Hamano 提交于
* bs/maint-pre-commit-hook-sample: pre-commit.sample: Diff against the empty tree when HEAD is invalid
-
由 Junio C Hamano 提交于
* js/maint-diff-color-words: diff --color-words: bit of clean-up diff --color-words -U0: fix the location of hunk headers t4034-diff-words: add a test for word diff without context Conflicts: diff.c
-
由 Junio C Hamano 提交于
* rs/pretty-wrap: log --format: don't ignore %w() at the start of format string Implement wrap format %w() as if it is a mode switch Conflicts: pretty.c
-
由 Junio C Hamano 提交于
* js/log-rewrap: Teach --wrap to only indent without wrapping Add strbuf_add_wrapped_text() to utf8.[ch] print_wrapped_text(): allow hard newlines
-
由 Junio C Hamano 提交于
* fc/doc-fast-forward: Use 'fast-forward' all over the place Conflicts: builtin-merge.c
-
由 Junio C Hamano 提交于
* sc/difftool-p4merge: mergetool--lib: add p4merge as a pre-configured mergetool option
-
由 Junio C Hamano 提交于
* jk/maint-add-p-empty: add-interactive: handle deletion of empty files
-
由 Junio C Hamano 提交于
* lt/revision-bisect: Add '--bisect' revision machinery argument
-
由 Junio C Hamano 提交于
* jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line
-
由 Junio C Hamano 提交于
* tr/maint-roff-quote: Quote ' as \(aq in manpages
-
由 Junio C Hamano 提交于
* ja/fetch-doc: Documentation/merge-options.txt: order options in alphabetical groups Documentation/git-pull.txt: Add subtitles above included option files Documentation/fetch-options.txt: order options alphabetically
-
由 Junio C Hamano 提交于
* cb/doc-fetch-pull-merge: modernize fetch/merge/pull examples
-
由 Junio C Hamano 提交于
* jk/maint-cvsimport-pathname: cvsimport: fix relative argument filenames
-
由 Junio C Hamano 提交于
* jc/receive-pack-auto: receive-pack: run "gc --auto --quiet" and optionally "update-server-info" gc --auto --quiet: make the notice a bit less verboase
-
由 Junio C Hamano 提交于
* gb/maint-gitweb-esc-param: gitweb: fix esc_param
-
由 Junio C Hamano 提交于
* jn/gitweb-patch: gitweb: Do not show 'patch' link for merge commits
-
- 15 11月, 2009 1 次提交
-
-
由 Junio C Hamano 提交于
* maint: git-add.txt: fix formatting of --patch section
-