Age | Commit message (Collapse) | Author |
|
* 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
|
|
* jn/checkout-doc:
Documentation/checkout: clarify description
Documentation/checkout: clarify description
|
|
* 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
|
|
|
|
* maint:
Update draft release notes to 1.7.1.1
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* mc/maint-zoneparse:
Add "Z" as an alias for the timezone "UTC"
|
|
* jk/diff-m-doc:
docs: clarify meaning of -M for git-log
|
|
* jn/maint-doc-ignore:
gitignore.5: Clarify matching rules
|
|
* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
|
|
* jk/maint-sha1-file-name-fix:
remove over-eager caching in sha1_file_name
|
|
* jk/maint-pull-dry-run-noop:
pull: do nothing on --dry-run
|
|
* bw/diff-metainfo-color:
diff: fix coloring of extended diff headers
|
|
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
|
|
* 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
Documentation/notes: document format of notes trees
|
|
* ab/test-cleanup:
Turn setup code in t2007-checkout-symlink.sh into a test
Move t6000lib.sh to lib-*
|
|
* rs/diff-no-minimal:
git diff too slow for a file
|
|
* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF
|
|
* maint:
gitweb/Makefile: fix typo in gitweb.min.css rule
Conflicts:
gitweb/Makefile
|
|
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>
|
|
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
This typo has been in place since the rule was originally added by
0e6ce21 (Gitweb: add support for minifying gitweb.css).
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file
Conflicts:
diff.c
|
|
* by/diff-graph:
Make --color-words work well with --graph
graph.c: register a callback for graph output
Emit a whole line in one go
diff.c: Output the text graph padding before each diff line
Output the graph columns at the end of the commit message
Add a prefix output callback to diff output
Conflicts:
diff.c
|
|
* cb/ls-files-cdup:
ls-files: allow relative pathspec
quote.c: separate quoting and relative path generation
|
|
* jc/t9129-any-utf8:
t9129: fix UTF-8 locale detection
|
|
* rr/am-help:
git am: Remove stray error message from sed
git am: Display some help text when patch is empty
git am: Set cmdline globally
|
|
* jn/rebase-cmdline-fix:
rebase: improve error message when upstream argument is missing
|
|
* ps/gitweb--browse-chrome:
git-web--browse: Add support for google chrome and chromium
|
|
* jk/am-skip-hint:
git-am: suggest what to do with superfluous patches
|
|
* jh/diff-index-line-abbrev:
diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
Conflicts:
diff.c
|
|
* ab/maint-perl-use-instlibdir:
Makefile: remove redundant munging of @@INSTLIBDIR@@
|
|
* ec/diff-noprefix-config:
diff: add configuration option for disabling diff prefixes.
|
|
* mg/status-b:
Documentation+t5708: document and test status -s -b
Show branch information in short output of git status
|
|
* jn/gitweb-plackup:
git-instaweb: Add support for running gitweb via 'plackup'
git-instaweb: Wait for server to start before running web browser
git-instaweb: Remove pidfile after stopping web server
git-instaweb: Configure it to work with new gitweb structure
git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
gitweb: Set default destination directory for installing gitweb in Makefile
gitweb: Move static files into seperate subdirectory
|
|
* jk/url-decode:
decode file:// and ssh:// URLs
make url-related functions reusable
|
|
* jn/remote-set-branches:
Add git remote set-branches
Conflicts:
builtin/remote.c
|
|
* rc/ls-remote-default:
ls-remote: print URL when no repo is specified
|
|
* hg/id-munging:
convert: Keep foreign $Id$ on checkout.
convert: Safer handling of $Id$ contraction.
|
|
* 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 creation
Conflicts:
builtin.h
|
|
* ph/clone-message-reword:
clone: reword messages to match the end-user perception
|
|
... to exclude items meant to go to 1.7.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
* cw/maint-exec-defpath:
autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
exec_cmd.c: replace hard-coded path list with one from <paths.h>
|
|
* sc/http-late-auth:
Prompt for a username when an HTTP request 401s
|
|
* by/blame-doc-m-c:
blame-options.txt: Add default value for `-M/-C` options.
|
|
* cb/maint-stash-orphaned-file:
stash tests: stash can lose data in a file removed from the index
stash: Don't overwrite files that have gone from the index
|
|
* mg/advice-statushints:
wt-status: take advice.statusHints seriously
t7508: test advice.statusHints
|