1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
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
Junio C Hamano
Merge branch 'pk/stash-apply-status-relative' into maint * pk/stash-apply-status-relative: Add test: git stash shows status relative to current dir git stash: show status relative to current directory
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint * jc/maint-diff-q-filter: diff --quiet: disable optimization when --diff-filter=X is used
Junio C Hamano
Merge branch 'js/maint-stash-index-copy' into maint * js/maint-stash-index-copy: stash: copy the index using --index-output instead of cp -p stash: fix incorrect quoting in cleanup of temporary files
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree' into maint * mg/doc-bisect-tweak-worktree: git-bisect.txt: example for bisecting with hot-fix git-bisect.txt: streamline run presentation
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches' into maint * jh/maint-do-not-track-non-branches: branch/checkout --track: Ensure that upstream branch is indeed a branch
Junio C Hamano
Merge branch 'fk/maint-cvsimport-early-failure' into maint * fk/maint-cvsimport-early-failure: git-cvsimport.perl: Bail out right away when reading from the server fails
Junio C Hamano
Merge branch 'jc/maint-apply-report-offset' into maint * jc/maint-apply-report-offset: apply -v: show offset count when patch did not apply exactly
Junio C Hamano
Merge branch 'jc/maint-apply-no-double-patch' into maint * jc/maint-apply-no-double-patch: apply: do not patch lines that were already patched
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink' into maint * js/checkout-untracked-symlink: do not overwrite untracked symlinks Demonstrate breakage: checkout overwrites untracked symlink with directory
Junio C Hamano
Merge "checkout ambiguous ref bugfix" into maint * commit '0cb6ad3': checkout: fix bug with ambiguous refs
Junio C Hamano
"log --cherry-pick" documentation regression fix Earlier f98fd43 (git-log.txt,rev-list-options.txt: put option blocks in proper order, 2011-03-08) moved the text around in the documentation for options in the rev-list family of commands such as "log". Consequently, the description of the --cherry-pick option appears way above the description of the --left-right option now. But the description of the --cherry-pick option still refers to the exa…
Michael J Gruber
revisions.txt: structure with a labelled list Currently, the reader has to parse a textual description in order to find a specific syntax in the list. Restructure as a labelled list with systematic labels as well as concrete examples as a visual guide. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
revisions.txt: consistent use of quotes Our use of quotes is inconsistent everywhere and within some files. Before reworking the structure of revisions.txt, make the quotes consistent: `git command` 'some snippet or term' The former gets typeset as code, the latter with some form of emphasis. the man backend uses two types of emphasis. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@…
Jeff King
docs: fix filter-branch subdir example for exotic repo names The GIT_INDEX_FILE variable we get from git has the full path to the repo, which may contain spaces. When we use it in our shell snippet, it needs to be quoted. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.5-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5-rc0
Junio C Hamano
Merge branch 'maint' * maint: parse-remote: typofix
Junio C Hamano
parse-remote: typofix An earlier patch had a trivial typo that two people did not notice. Pointed out by Michael Schubert. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Morey-Chaisemartin
submodule: process conflicting submodules only once During a merge module_list returns conflicting submodules several times (stage 1,2,3) which caused the submodules to be used multiple times in git submodule init, sync, update and status command. There are 5 callers of module_list; they all read (mode, sha1, stage, path) tuple, and most of them care only about path. As a first level approximation, it should be Ok (in the sense that it does not m…
  1. Prev
  2. Next