919e06b228
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
2010-06-21 06:02:42 -07:00
a031d76eeb
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
2010-06-21 06:02:42 -07:00
f28f04923e
Merge branch 'jn/checkout-doc'
...
* jn/checkout-doc:
Documentation/checkout: clarify description
Documentation/checkout: clarify description
2010-06-21 06:02:42 -07:00
5bebcd4ecb
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
2010-06-21 06:02:41 -07:00
8c6b5a8454
Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
2010-06-21 05:49:26 -07:00
379e48fa5f
Merge branch 'maint'
...
* maint:
Update draft release notes to 1.7.1.1
2010-06-21 05:48:50 -07:00
9932977173
Update draft release notes to 1.7.1.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-21 05:48:18 -07:00
e7e1bf0c29
Merge branch 'mc/maint-zoneparse' into maint
...
* mc/maint-zoneparse:
Add "Z" as an alias for the timezone "UTC"
2010-06-21 05:41:03 -07:00
7a0d54facd
Merge branch 'jk/diff-m-doc' into maint
...
* jk/diff-m-doc:
docs: clarify meaning of -M for git-log
2010-06-21 05:40:57 -07:00
b17847884f
Merge branch 'jn/maint-doc-ignore' into maint
...
* jn/maint-doc-ignore:
gitignore.5: Clarify matching rules
2010-06-21 05:40:53 -07:00
065a652d64
Merge branch 'bs/userdiff-php' into maint
...
* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
2010-06-21 05:40:48 -07:00
951f92d2ab
Merge branch 'jk/maint-sha1-file-name-fix' into maint
...
* jk/maint-sha1-file-name-fix:
remove over-eager caching in sha1_file_name
2010-06-21 05:40:41 -07:00
d0780b0643
Merge branch 'jk/maint-pull-dry-run-noop' into maint
...
* jk/maint-pull-dry-run-noop:
pull: do nothing on --dry-run
2010-06-21 05:40:33 -07:00
cb2af93ac1
Merge branch 'bw/diff-metainfo-color' into maint
...
* bw/diff-metainfo-color:
diff: fix coloring of extended diff headers
2010-06-21 05:40:10 -07:00
443f26cbca
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"
2010-06-21 05:39:23 -07:00
1b9fa0e811
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
Documentation/notes: document format of notes trees
2010-06-21 05:39:16 -07:00
6f79d66891
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-*
2010-06-21 05:39:02 -07:00
60335534a6
Merge branch 'rs/diff-no-minimal' into maint
...
* rs/diff-no-minimal:
git diff too slow for a file
2010-06-21 05:38:50 -07:00
e1ba0f6340
Merge branch 'bg/apply-blank-trailing-context' into maint
...
* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF
2010-06-21 05:38:36 -07:00
b43688a5bc
Merge branch 'maint'
...
* maint:
gitweb/Makefile: fix typo in gitweb.min.css rule
Conflicts:
gitweb/Makefile
2010-06-20 23:21:27 -07:00
1f0eb51391
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>
2010-06-20 21:58:26 -07:00
fce338a543
git-cvsserver: typo in a comment: bas -> has
...
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-20 21:57:34 -07:00
70649945c2
gitweb/Makefile: fix typo in gitweb.min.css rule
...
This typo has been in place since the rule was originally added by
0e6ce21
2010-06-20 11:09:41 -07:00
049e98c875
Update draft release notes to 1.7.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-18 11:27:01 -07:00
5977744d04
Merge branch 'cc/maint-diff-CC-binary'
...
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file
Conflicts:
diff.c
2010-06-18 11:16:57 -07:00
98ad90fbab
Merge branch 'by/diff-graph'
...
* 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
2010-06-18 11:16:57 -07:00
e09151281d
Merge branch 'cb/ls-files-cdup'
...
* cb/ls-files-cdup:
ls-files: allow relative pathspec
quote.c: separate quoting and relative path generation
2010-06-18 11:16:56 -07:00
f159bdd48d
Merge branch 'jc/t9129-any-utf8'
...
* jc/t9129-any-utf8:
t9129: fix UTF-8 locale detection
2010-06-18 11:16:56 -07:00
8b8063cef3
Merge branch 'rr/am-help'
...
* 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
2010-06-18 11:16:56 -07:00
0f0169d153
Merge branch 'jn/rebase-cmdline-fix'
...
* jn/rebase-cmdline-fix:
rebase: improve error message when upstream argument is missing
2010-06-18 11:16:56 -07:00
2ad6b14353
Merge branch 'ps/gitweb--browse-chrome'
...
* ps/gitweb--browse-chrome:
git-web--browse: Add support for google chrome and chromium
2010-06-18 11:16:56 -07:00
af2fc76b4a
Merge branch 'jk/am-skip-hint'
...
* jk/am-skip-hint:
git-am: suggest what to do with superfluous patches
2010-06-18 11:16:56 -07:00
18fd805583
Merge branch 'jh/diff-index-line-abbrev'
...
* jh/diff-index-line-abbrev:
diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
Conflicts:
diff.c
2010-06-18 11:16:56 -07:00
ecdb3ec984
Merge branch 'ab/maint-perl-use-instlibdir'
...
* ab/maint-perl-use-instlibdir:
Makefile: remove redundant munging of @@INSTLIBDIR@@
2010-06-18 11:16:55 -07:00
2621ac50cc
Merge branch 'ec/diff-noprefix-config'
...
* ec/diff-noprefix-config:
diff: add configuration option for disabling diff prefixes.
2010-06-18 11:16:55 -07:00
880bd9d080
Merge branch 'mg/status-b'
...
* mg/status-b:
Documentation+t5708: document and test status -s -b
Show branch information in short output of git status
2010-06-18 11:16:55 -07:00
7c1b228d26
Merge branch 'jn/gitweb-plackup'
...
* 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
2010-06-18 11:16:55 -07:00
bcacc0ebdb
Merge branch 'jk/url-decode'
...
* jk/url-decode:
decode file:// and ssh:// URLs
make url-related functions reusable
2010-06-18 11:16:55 -07:00
1c5d6b2a40
Merge branch 'jn/remote-set-branches'
...
* jn/remote-set-branches:
Add git remote set-branches
Conflicts:
builtin/remote.c
2010-06-18 11:16:55 -07:00
199d4c0d43
Merge branch 'rc/ls-remote-default'
...
* rc/ls-remote-default:
ls-remote: print URL when no repo is specified
2010-06-18 11:16:54 -07:00
6c6f87842b
Merge branch 'hg/id-munging'
...
* hg/id-munging:
convert: Keep foreign $Id$ on checkout.
convert: Safer handling of $Id$ contraction.
2010-06-18 11:16:54 -07:00
8642abc764
Merge branch 'tc/merge-m-log'
...
* 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
2010-06-18 11:16:54 -07:00
fd8b005c0d
Merge branch 'ph/clone-message-reword'
...
* ph/clone-message-reword:
clone: reword messages to match the end-user perception
2010-06-18 11:16:53 -07:00
d0b8d79510
Update draft release notes to 1.7.2
...
... to exclude items meant to go to 1.7.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-16 17:10:11 -07:00
3c0ae1bd72
Merge 'maint' updates in
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-16 17:09:31 -07:00
45a0ee1163
Prepare draft release notes to 1.7.1.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-16 17:00:53 -07:00
7e74a73e6b
Merge branch 'cw/maint-exec-defpath' into maint
...
* 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>
2010-06-16 16:33:47 -07:00
356169c1f6
Merge branch 'sc/http-late-auth' into maint
...
* sc/http-late-auth:
Prompt for a username when an HTTP request 401s
2010-06-16 16:32:15 -07:00
3b3b9a6152
Merge branch 'by/blame-doc-m-c' into maint
...
* by/blame-doc-m-c:
blame-options.txt: Add default value for `-M/-C` options.
2010-06-16 16:23:51 -07:00
91788cf26e
Merge branch 'cb/maint-stash-orphaned-file' into maint
...
* 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
2010-06-16 16:23:48 -07:00
Junio C Hamano
Ævar Arnfjörð Bjarmason
Jay Soffian