| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
As "git merge" fast forwards if possible, it seems sensible to
have such a feature for "git cherry-pick" too, especially as it
could be used in git-rebase--interactive.sh.
Maybe this option could be made the default in the long run, with
another --no-ff option to disable this default behavior, but that
could make some scripts backward incompatible and/or that would
require testing if some GIT_AUTHOR_* environment variables are
set. So we don't do that for now.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
and also export it in "cache.h".
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* maint:
Update draft release notes to 1.7.0.2
Remove extra '-' from git-am(1)
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* jn/gitweb-config-error-die:
gitweb: Die if there are parsing errors in config file
|
|
* jn/maint-fix-pager:
tests: Fix race condition in t7006-pager
t7006-pager: if stdout is not a terminal, make a new one
tests: Add tests for automatic use of pager
am: Fix launching of pager
git svn: Fix launching of pager
git.1: Clarify the behavior of the --paginate option
Make 'git var GIT_PAGER' always print the configured pager
Fix 'git var' usage synopsis
|
|
* tr/maint-cherry-pick-list:
cherry_pick_list: quit early if one side is empty
|
|
* ld/maint-diff-quiet-w:
git-diff: add a test for git diff --quiet -w
git diff --quiet -w: check and report the status
|
|
* rs/optim-text-wrap:
utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
utf8.c: remove strbuf_write()
utf8.c: remove print_spaces()
utf8.c: remove print_wrapped_text()
|
|
* dp/read-not-mmap-small-loose-object:
hash-object: don't use mmap() for small files
|
|
* np/compress-loose-object-memsave:
sha1_file: be paranoid when creating loose objects
sha1_file: don't malloc the whole compressed result when writing out objects
|
|
* jc/maint-status-preload:
status: preload index to optimize lstat(2) calls
|
|
* gf/maint-sh-setup-nongit-ok:
require_work_tree broken with NONGIT_OK
|
|
* cc/maint-bisect-paths:
bisect: error out when passing bad path parameters
|
|
* maint-1.6.6:
Remove extra '-' from git-am(1)
|
|
* maint-1.6.5:
Remove extra '-' from git-am(1)
|
|
Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
All tests in t9119 were disabled for subversion versions other than
1.[45].*. Make the test script run with subversion 1.[456].*.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
|
|
The delayed loading of SVN missed a place where SVN::Core is used. Make
sure to load the package before trying to use it.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
|
|
* maint:
Start preparing for 1.7.0.2
Conflicts:
RelNotes
|
|
* 'jh/maint-submodule-status-in-void' (early part):
submodule summary: do not shift a non-existent positional variable
|
|
When "git submodule summary" is run without any argument, we default to
compare the state of index with the HEAD, but tried to shift out $1 that
does not exist (and worse yet, we didn't use it).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* tc/maint-transport-ls-remote-with-void:
transport: add got_remote_refs flag
|
|
* hm/maint-imap-send-crlf:
git-imap-send: Convert LF to CRLF before storing patch to draft box
|
|
* sp/maint-push-sideband:
receive-pack: Send internal errors over side-band #2
t5401: Use a bare repository for the remote peer
receive-pack: Send hook output over side band #2
receive-pack: Wrap status reports inside side-band-64k
receive-pack: Refactor how capabilities are shown to the client
send-pack: demultiplex a sideband stream with status data
run-command: support custom fd-set in async
run-command: Allow stderr to be a caller supplied pipe
Conflicts:
builtin-receive-pack.c
run-command.c
t/t5401-update-hooks.sh
|
|
* jc/maint-fix-test-perm:
lib-patch-mode.sh: Fix permission
t6000lib: Fix permission
|
|
* np/fast-import-idx-v2:
fast-import: use the diff_delta() max_delta_size argument
fast-import: honor pack.indexversion and pack.packsizelimit config vars
fast-import: make default pack size unlimited
fast-import: use write_idx_file() instead of custom code
fast-import: use sha1write() for pack data
fast-import: start using struct pack_idx_entry
|
|
* maint:
gitweb: Fix project-specific feature override behavior
gitweb multiple project roots documentation
|
|
* jn/maint-fix-pager:
tests: Fix race condition in t7006-pager
t7006-pager: if stdout is not a terminal, make a new one
tests: Add tests for automatic use of pager
am: Fix launching of pager
git svn: Fix launching of pager
git.1: Clarify the behavior of the --paginate option
Make 'git var GIT_PAGER' always print the configured pager
Fix 'git var' usage synopsis
|
|
* ml/encode-header-refactor:
move encode_in_pack_object_header() to a better place
refactor duplicated encode_header in pack-objects and fast-import
|
|
* jn/gitweb-config-error-die:
gitweb: Die if there are parsing errors in config file
|
|
* jc/for-each-ref:
for-each-ref --format='%(flag)'
for-each-ref --format='%(symref) %(symref:short)'
builtin-for-each-ref.c: check if we need to peel onion while parsing the format
builtin-for-each-ref.c: comment fixes
|
|
* ld/maint-diff-quiet-w:
git-diff: add a test for git diff --quiet -w
git diff --quiet -w: check and report the status
|
|
* tr/maint-cherry-pick-list:
cherry_pick_list: quit early if one side is empty
|
|
* rs/optim-text-wrap:
utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
utf8.c: remove strbuf_write()
utf8.c: remove print_spaces()
utf8.c: remove print_wrapped_text()
|
|
* ml/send-pack-transport-refactor:
refactor duplicated code in builtin-send-pack.c and transport.c
|
|
* ml/fill-mm-refactor:
refactor duplicated fill_mm() in checkout and merge-recursive
|
|
* ml/connect-refactor:
connect.c: move duplicated code to a new function 'get_host_and_port'
|
|
* np/compress-loose-object-memsave:
sha1_file: be paranoid when creating loose objects
sha1_file: don't malloc the whole compressed result when writing out objects
|
|
* dp/read-not-mmap-small-loose-object:
hash-object: don't use mmap() for small files
|
|
* jn/makedepend:
Makefile: clarify definition of TEST_OBJS
Makefile: always remove .depend directories on 'make clean'
Makefile: tuck away generated makefile fragments in .depend
Teach Makefile to check header dependencies
Makefile: list standalone program object files in PROGRAM_OBJS
Makefile: lazily compute header dependencies
Makefile: list generated object files in OBJECTS
Makefile: disable default implicit rules
Makefile: rearrange dependency rules
Makefile: transport.o depends on branch.h now
Makefile: drop dependency on $(wildcard */*.h)
Makefile: clean up http-walker.o dependency rules
Makefile: remove wt-status.h from LIB_H
Makefile: make sure test helpers are rebuilt when headers change
Makefile: add missing header file dependencies
Conflicts:
Makefile
|
|
* jc/maint-status-preload:
status: preload index to optimize lstat(2) calls
|
|
* gf/maint-sh-setup-nongit-ok:
require_work_tree broken with NONGIT_OK
|
|
* jh/maint-submodule-status-in-void:
submodule summary: Don't barf when invoked in an empty repo
|
|
* hm/imap-send-cram-md5:
imap-send: support CRAM-MD5 authentication
|
|
* ml/color-when:
Add an optional argument for --color options
|
|
* ac/cvsimport-revision-mapping:
cvsimport: new -R option: generate .git/cvs-revisions mapping
|
|
* jc/grep-author-all-match-implicit:
"log --author=me --grep=it" should find intersection, not union
|
Junio C Hamano
Michal Sojka
Michael J Gruber
Jeff King