1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Merge branch 'jn/checkout-doc' into maint * jn/checkout-doc: Documentation/checkout: clarify description Documentation/checkout: clarify description
Junio C Hamano
Merge branch 'cc/maint-diff-CC-binary' into maint * cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c
Junio C Hamano
Merge branch 'jc/t9129-any-utf8' into maint * jc/t9129-any-utf8: t9129: fix UTF-8 locale detection
Junio C Hamano
Merge branch 'cb/ls-files-cdup' into maint * cb/ls-files-cdup: ls-files: allow relative pathspec quote.c: separate quoting and relative path generation
Junio C Hamano
Merge branch 'tc/merge-m-log' into maint * tc/merge-m-log: merge: --log appends shortlog to message if specified fmt-merge-msg: add function to append shortlog only fmt-merge-msg: refactor merge title formatting fmt-merge-msg: minor refactor of fmt_merge_msg() merge: rename variable merge: update comment t7604-merge-custom-message: show that --log doesn't append to -m t7604-merge-custom-message: shift expected output crea…
Junio C Hamano
Merge branch 'ph/clone-message-reword' into maint * ph/clone-message-reword: clone: reword messages to match the end-user perception
Junio C Hamano
Merge branch 'jn/maint-amend-missing-name' into maint * jn/maint-amend-missing-name: commit --amend: cope with missing display name
Junio C Hamano
Merge branch 'pc/remove-warn' into maint * pc/remove-warn: Remove a redundant errno test in a usage of remove_path Introduce remove_or_warn function Implement the rmdir_or_warn function Generalise the unlink_or_warn function
Junio C Hamano
tests: remove unnecessary '^' from 'expr' regular expression As Brandon noticed, a regular expression match given to 'expr' is already anchored at the beginning. Some versions of expr even complain about this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'js/maint-receive-pack-symref-alias' * js/maint-receive-pack-symref-alias:
Junio C Hamano
Merge branch 'cc/maint-commit-reflog-msg' * cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message
Junio C Hamano
Merge branch 'ic/maint-rebase-i-abort' * ic/maint-rebase-i-abort: rebase -i: Abort cleanly if new base cannot be checked out
Junio C Hamano
Merge branch 'jk/maint-advice-empty-amend' * jk/maint-advice-empty-amend: commit: give advice on empty amend
Junio C Hamano
Merge branch 'eb/core-eol' * eb/core-eol: Add "core.eol" config variable Rename the "crlf" attribute "text" Add per-repository eol normalization Add tests for per-repository eol normalization Conflicts: Documentation/config.txt Makefile
Junio C Hamano
Merge branch 'fg/autocrlf' * fg/autocrlf: autocrlf: Make it work also for un-normalized repositories
Junio C Hamano
Merge branch 'sm/branch-broken-ref' * sm/branch-broken-ref: branch: don't fail listing branches if one of the commits wasn't found branch: exit status now reflects if branch listing finds an error
Junio C Hamano
Merge branch 'rr/parse-date-refactor' * rr/parse-date-refactor: Refactor parse_date for approxidate functions
Junio C Hamano
Merge branch 'jn/document-rebase-i-p-limitation' * jn/document-rebase-i-p-limitation: rebase -i -p: document shortcomings
Junio C Hamano
Merge branch 'tc/commit-abbrev-fix' * tc/commit-abbrev-fix: commit::print_summary(): don't use format_commit_message() t7502-commit: add summary output tests for empty and merge commits t7502-commit: add tests for summary output
Junio C Hamano
Merge branch 'tr/receive-pack-aliased-update-fix' * tr/receive-pack-aliased-update-fix: check_aliased_update: strcpy() instead of strcat() to copy
Junio C Hamano
Merge branch 'gs/usage-to-stdout' * gs/usage-to-stdout: parseopt: wrap rev-parse --parseopt usage for eval consumption print the usage string on stdout instead of stderr Conflicts: parse-options.h
Junio C Hamano
Merge branch 'js/async-thread' * js/async-thread: fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f) Enable threaded async procedures whenever pthreads is available Dying in an async procedure should only exit the thread, not the process. Reimplement async procedures using pthreads Windows: more pthreads functions Fix signature of fcntl() compatibility dummy Make report() from usage.c public as …
Junio C Hamano
Merge branch 'gv/portable' * gv/portable: test-lib: use DIFF definition from GIT-BUILD-OPTIONS build: propagate $DIFF to scripts Makefile: Tru64 portability fix Makefile: HP-UX 10.20 portability fixes Makefile: HPUX11 portability fixes Makefile: SunOS 5.6 portability fix inline declaration does not work on AIX Allow disabling "inline" Some platforms lack socklen_t type Make NO_{INET_NTOP,INET_PTON} confi…
Junio C Hamano
Merge branch 'bc/portable' * bc/portable: Remove python 2.5'isms Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS t/aggregate-results: accomodate systems with small max argument list length t/t7006: ignore return status of shell's unset builtin t/t5150: remove space from sed script git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh t/t5800: skip if python version is older than 2.5
Junio C Hamano
Merge branch 'jn/gitweb-fastcgi' * jn/gitweb-fastcgi: gitweb: Run in FastCGI mode if gitweb script has .fcgi extension gitweb: Add support for FastCGI, using CGI::Fast gitweb: Put all per-connection code in run() subroutine
Junio C Hamano
Merge branch 'jn/checkout-doc' * jn/checkout-doc: Documentation/checkout: clarify description Documentation/checkout: clarify description
Junio C Hamano
Merge branch 'em/checkout-orphan' * em/checkout-orphan: log_ref_setup: don't return stack-allocated array bash completion: add --orphan to 'git checkout' t3200: test -l with core.logAllRefUpdates options checkout --orphan: respect -l option always refs: split log_ref_write logic into log_ref_setup Documentation: alter checkout --orphan description
Junio C Hamano
Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
Junio C Hamano
Merge branch 'maint' * maint: Update draft release notes to 1.7.1.1
Junio C Hamano
Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next