1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Jakub Narębski
gitweb: Fix parsing of negative fractional timezones in JavaScript 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…
Junio C Hamano
Merge branch 'nm/maint-conflicted-submodule-entries' * nm/maint-conflicted-submodule-entries: submodule: process conflicting submodules only once
Junio C Hamano
Merge branch 'maint' * maint: Start preparing for 1.7.4.4 pull: do not clobber untracked files on initial pull compat: add missing #include <sys/resource.h> Conflicts: RelNotes
Junio C Hamano
Start preparing for 1.7.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
pull: do not clobber untracked files on initial pull 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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/index-update-if-able' into maint * jc/index-update-if-able: update $GIT_INDEX_FILE when there are racily clean entries diff/status: refactor opportunistic index update
Junio C Hamano
Merge branch 'lt/default-abbrev' into maint * lt/default-abbrev: Rename core.abbrevlength back to core.abbrev Make the default abbrev length configurable
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into maint * jc/maint-rev-list-culled-boundary: list-objects.c: don't add an unparsed NULL as a pending tree Conflicts: list-objects.c
Junio C Hamano
Merge branch 'mm/maint-log-n-with-diff-filtering' into maint * mm/maint-log-n-with-diff-filtering: log: fix --max-count when used together with -S or -G
Junio C Hamano
Merge branch 'jk/format-patch-multiline-header' into maint * jk/format-patch-multiline-header: format-patch: rfc2047-encode newlines in headers format-patch: wrap long header lines strbuf: add fixed-length version of add_wrapped_text
Junio C Hamano
Merge branch 'jn/maint-instaweb-plack-fix' into maint * jn/maint-instaweb-plack-fix: git-instaweb: Change how gitweb.psgi is made runnable as standalone app
Junio C Hamano
Merge branch 'lp/config-vername-check' into maint * lp/config-vername-check: Disallow empty section and variable names Sanity-check config variable names
Jonathan Nieder
compat: add missing #include <sys/resource.h> Starting with commit c793430 (Limit file descriptors used by packs, 2011-02-28), git uses getrlimit to tell how many file descriptors it can use. Unfortunately it does not include the header declaring that function, resulting in compilation errors: sha1_file.c: In function 'open_packed_git_1': sha1_file.c:718: error: storage size of 'lim' isn't known sha1_file.c:721: warning: implicit declara…
Lawrence Mitchell
git.el: Don't use font-lock-compile-keywords If font-lock is disabled, font-lock-compile-keywords complains. Really what we want to do is to replace log-edit's font-lock definitions with our own, so define a major mode deriving from log-edit and set up font-lock-defaults there. We then use the optional MODE argument to log-edit to set up the major mode of the commit buffer appropriately. Signed-off-by: Lawrence Mitchell <wence@gmx.li> Acke…
Ævar Arnfjörð Bjarmason
t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT The t2019-checkout-ambiguous-ref.sh tests added in v1.7.4.3~12^2 examines the output for a translatable string, and must be marked with C_LOCALE_OUTPUT; otherwise, GETTEXT_POISON=YesPlease tests will break. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dan McGee
Fix two unused variable warnings in gcc 4.6 Seen with -Wunused-but-set-variable. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dan McGee
Remove old binaries from .gitignore These two programs were dumped a while ago. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd
sparse: Fix errors and silence warnings * load_file() returns a void pointer but is using 0 for the return value * builtin/receive-pack.c forgot to include builtin.h * packet_trace_prefix can be marked static * ll_merge takes a pointer for its last argument, not an int * crc32 expects a pointer as the second argument but Z_NULL is defined to be 0 (see 38f4d13 sparse fix: Using plain integer as NULL pointer, 2006-11-18 …
Junio C Hamano
Update release notes As 1.7.4.3 has backmerged a handful of fixes from the master, drop these entries from 1.7.5 release notes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.7.4.3
Junio C Hamano
Git 1.7.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4.3
Junio C Hamano
Doc: mention --delta-base-offset is the default for Porcelain commands The underlying pack-objects plumbing command still needs an explicit option from the command line, but these days Porcelain passes the option, so there is no need for end users to worry about it anymore. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'nd/init-gitdir' * nd/init-gitdir: init, clone: support --separate-git-dir for .git file git-init.txt: move description section up Conflicts: builtin/clone.c
Junio C Hamano
Merge branch 'jc/merge-sans-branch' * jc/merge-sans-branch: merge: merge with the default upstream branch without argument merge: match the help text with the documentation Conflicts: builtin/merge.c
Junio C Hamano
Merge branch 'jr/grep-en-config' * jr/grep-en-config: grep: allow -E and -n to be turned on by default via configuration
Junio C Hamano
Merge branch 'ab/i18n-st' * ab/i18n-st: (69 commits) i18n: git-shortlog basic messages i18n: git-revert split up "could not revert/apply" message i18n: git-revert literal "me" messages i18n: git-revert "Your local changes" message i18n: git-revert basic messages i18n: git-notes GIT_NOTES_REWRITE_MODE error message i18n: git-notes basic commands i18n: git-gc "Auto packing the repository" message i18n: git-…
Junio C Hamano
Merge branch 'jk/pull-into-empty' * jk/pull-into-empty: pull: do not clobber untracked files on initial pull merge: merge unborn index before setting ref
Junio C Hamano
Merge branch 'sb/sparse-more' * sb/sparse-more: Makefile: Cover more files with make check
Junio C Hamano
Merge branch 'maint' * maint: docs: fix filter-branch subdir example for exotic repo names
Junio C Hamano
Merge branch 'nd/index-doc' into maint * nd/index-doc: doc: technical details about the index file format doc: technical details about the index file format
  1. Prev
  2. Next