Commits

Author Commit Message Labels Comments Date
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>
Junio C Hamano
Merge branch 'mc/maint-zoneparse' into maint * mc/maint-zoneparse: Add "Z" as an alias for the timezone "UTC"
Junio C Hamano
Merge branch 'jk/diff-m-doc' into maint * jk/diff-m-doc: docs: clarify meaning of -M for git-log
Junio C Hamano
Merge branch 'jn/maint-doc-ignore' into maint * jn/maint-doc-ignore: gitignore.5: Clarify matching rules
Junio C Hamano
Merge branch 'bs/userdiff-php' into maint * bs/userdiff-php: diff: Support visibility modifiers in the PHP hunk header regexp
Junio C Hamano
Merge branch 'jk/maint-sha1-file-name-fix' into maint * jk/maint-sha1-file-name-fix: remove over-eager caching in sha1_file_name
Junio C Hamano
Merge branch 'jk/maint-pull-dry-run-noop' into maint * jk/maint-pull-dry-run-noop: pull: do nothing on --dry-run
Junio C Hamano
Merge branch 'bw/diff-metainfo-color' into maint * bw/diff-metainfo-color: diff: fix coloring of extended diff headers
Junio C Hamano
Merge branch 'cb/assume-unchanged-fix' into maint * cb/assume-unchanged-fix: Documentation: git-add does not update files marked "assume unchanged" do not overwrite files marked "assume unchanged"
Junio C Hamano
Merge branch 'jn/notes-doc' into maint * jn/notes-doc: Documentation/notes: nitpicks Documentation/notes: clean up description of rewriting configuration Documentation/notes: simplify treatment of default display refs Documentation/log: add a CONFIGURATION section Documentation/notes: simplify treatment of default notes ref Documentation/notes: add configuration section Documentation/notes: describe content of notes blobs…
Junio C Hamano
Merge branch 'ab/test-cleanup' into maint * ab/test-cleanup: Turn setup code in t2007-checkout-symlink.sh into a test Move t6000lib.sh to lib-*
Junio C Hamano
Merge branch 'rs/diff-no-minimal' into maint * rs/diff-no-minimal: git diff too slow for a file
Junio C Hamano
Merge branch 'bg/apply-blank-trailing-context' into maint * bg/apply-blank-trailing-context: apply: Allow blank *trailing* context lines to match beyond EOF
Junio C Hamano
Merge branch 'maint' * maint: gitweb/Makefile: fix typo in gitweb.min.css rule Conflicts: gitweb/Makefile
Ævar Arnfjörð Bjarmason
git-cvsserver: fix error for invalid password formats Change the error message to report the erroneous password character. $1 was never set in the previos version, it was a leftover from older code that used a regex for the test. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next