1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Marc Branchaud
Docs: Add -X option to git-merge's synopsis. Also move -X's description next to -s's in merge-options.txt. This makes it easier to learn how to specify merge strategy options. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jl/maint-submodule-gitfile-awareness' * jl/maint-submodule-gitfile-awareness: Windows: start_command: Support non-NULL dir in struct child_process
Johannes Sixt
Windows: start_command: Support non-NULL dir in struct child_process A caller of start_command can set the member 'dir' to a directory to request that the child process starts with that directory as CWD. The first user of this feature was added recently in eee49b6 (Teach diff --submodule and status to handle .git files in submodules). On Windows, we have been lazy and had not implemented support for this feature, yet. This fixes the shortcoming. Signed-off-by: Jo…
Junio C Hamano
Sync with 1.7.0.5
Junio C Hamano
Merge branch 'jc/doc-submit-gmail' * jc/doc-submit-gmail: SubmittingPatches: update GMail section
Junio C Hamano
Git 1.7.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.0.5
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint * rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations
Junio C Hamano
blame documentation: -M/-C notice copied lines as well as moved ones Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd
t3507: Make test executable Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.1-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.1-rc1
Junio C Hamano
Merge branch 'mr/gitweb-jsmin' * mr/gitweb-jsmin: gitweb: update INSTALL to use shorter make target gitweb: add documentation to INSTALL regarding gitweb.js instaweb: add minification awareness Gitweb: add autoconfigure support for minifiers Gitweb: add support for minifying gitweb.css Gitweb: add ignore and clean rules for minified files
Junio C Hamano
Merge branch 'jl/maint-submodule-gitfile-awareness' * jl/maint-submodule-gitfile-awareness: Teach diff --submodule and status to handle .git files in submodules
Jens Lehmann
Teach diff --submodule and status to handle .git files in submodules The simple test for an existing .git directory gives an incorrect result if .git is a file that records "gitdir: overthere". So for submodules that use a .git file, "git status" and the diff family - when the "--submodule" option is given - did assume the submodule was not populated at all when a .git file was used, thus generating wrong output or no output at all. This is fixed by using read_git…
Junio C Hamano
Merge branch 'maint' * maint: Let check_preimage() use memset() to initialize "struct checkout" fetch/push: fix usage strings
Jens Lehmann
Let check_preimage() use memset() to initialize "struct checkout" Every code site except check_preimage() uses either memset() or declares a static instance of "struct checkout" to achieve proper initialization. Lets use memset() instead of explicit initialization of all members here too to be on the safe side in case this structure is expanded someday. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ef/maint-empty-commit-log' into maint * ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message
Junio C Hamano
Merge branch 'jc/conflict-marker-size' into maint * jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute
Junio C Hamano
Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maint * sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die()
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor' into maint * mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable
Junio C Hamano
Merge branch 'rr/imap-send-unconfuse-from-line' into maint * rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body
Junio C Hamano
Merge branch 'rb/maint-python-path' into maint * rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD
Junio C Hamano
Merge branch 'gh/maint-stash-show-error-message' into maint * gh/maint-stash-show-error-message: Improve error messages from 'git stash show'
Junio C Hamano
Merge branch 'mg/mailmap-update' into maint * mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
Junio C Hamano
Merge branch 'bc/maint-daemon-sans-ss-family' into maint * bc/maint-daemon-sans-ss-family: daemon.c: avoid accessing ss_family member of struct sockaddr_storage
Tay Ray Chuan
fetch/push: fix usage strings - use "<options>" instead of just "options". - use "[<repository> [<refspec>...]]" to indicate that <repository> and <refspec> are optional, and that <refspec> cannot be specified without specifying <repository>. Note that when called without specifying <repository> (eg. "git fetch -f"), it is accurate to say that the "git fetch [<options>] [<repository> ...]" case takes precedence over "…
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch' * rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations Conflicts: builtin-branch.c
Tay Ray Chuan
branch: say "Reset to" in reflog entries for 'git branch -f' operations In 5f856dd (fix reflog entries for "git-branch"), it is mentioned that 'git branch -f' is intended to be equivalent to 'git reset'. Since we usually say "reset to <commit>" in the git-reset Documentation and elsewhere, it would make sense to say "Reset to" here as well, instead of "Reset from" previously. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobo…
Junio C Hamano
Merge early parts of jk/cached-textconv
Junio C Hamano
diff.c: work around pointer constness warnings The textconv leak fix introduced two invocations of free() to release memory pointed by "const char *", which get annoying compiler warning.
Junio C Hamano
Merge branch 'maint' * maint: docs: clarify "branch -l"
  1. Prev
  2. Next