user/sven/git.git, branch v1.7.4.4

Git 1.7.4.4

2011-04-06T17:50:00Z

Signed-off-by: Junio C Hamano

Merge branch 'nm/maint-conflicted-submodule-entries' into maint

2011-04-06T17:41:17Z

* nm/maint-conflicted-submodule-entries: submodule: process conflicting submodules only once

Merge branch 'mg/rev-list-n-reverse-doc' into maint

2011-04-06T17:40:49Z

* mg/rev-list-n-reverse-doc: git-log.txt,rev-list-options.txt: put option blocks in proper order git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting

Documentation: trivial grammar fix in core.worktree description

2011-04-04T17:25:21Z

Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

gitweb: Fix parsing of negative fractional timezones in JavaScript

2011-04-04T16:33:05Z

Extract converting numerical timezone in the form of '(+|-)HHMM' to timezoneOffset function, and fix parsing of negative fractional timezones. This is used to format timestamps in 'blame_incremental' view; this complements commit 2b1e172 (gitweb: Fix handling of fractional timezones in parse_date, 2011-03-25). Now gitweb.cgi/git.git/blame_incremental/3fe5489:/contrib/gitview/gitview#l853 and gitweb.cgi/git.git/blame/3fe5489:/contrib/gitview/gitview#l853 show the same correct time in author's local timezone in title (on mouseover) [Aneesh Kumar K.V, 2006-02-24 00:59:42 +0530]. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

Start preparing for 1.7.4.4

2011-04-03T19:58:23Z

Signed-off-by: Junio C Hamano

pull: do not clobber untracked files on initial pull

2011-04-03T19:35:39Z

For a pull into an unborn branch, we do not use "git merge" at all. Instead, we call read-tree directly. However, we used the --reset parameter instead of "-m", which turns off the safety features. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jc/index-update-if-able' into maint

2011-04-03T19:33:05Z

* jc/index-update-if-able: update $GIT_INDEX_FILE when there are racily clean entries diff/status: refactor opportunistic index update

Merge branch 'lt/default-abbrev' into maint

2011-04-03T19:32:51Z

* lt/default-abbrev: Rename core.abbrevlength back to core.abbrev Make the default abbrev length configurable

Merge branch 'jc/maint-rev-list-culled-boundary' into maint

2011-04-03T19:32:35Z

* jc/maint-rev-list-culled-boundary: list-objects.c: don't add an unparsed NULL as a pending tree Conflicts: list-objects.c