Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.9.7 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9.7
Junio C Hamano
Sync with 1.7.8.6
Junio C Hamano
Git 1.7.8.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.8.6
Junio C Hamano
Sync with 1.7.7.7
Junio C Hamano
Git 1.7.7.7 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.7.7
Jonathan Nieder
bundle: remove stray single-quote from error message After running rev-list --boundary to retrieve the list of boundary commits, "git bundle create" runs its own revision walk. If in this stage git encounters an unfamiliar option, it writes a message with an unbalanced quotation mark: error: unrecognized argument: --foo' Drop the stray quote to match the "unrecognized argument: %s" message used elsewhere and save translators some work. This is …
Junio C Hamano
Merge branch 'maint-1.7.8' into maint-1.7.9 * maint-1.7.8: Documentation/gitweb: trivial English fixes fetch/receive: remove over-pessimistic connectivity check
Junio C Hamano
Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8 * jc/maint-verify-objects-remove-pessimism: fetch/receive: remove over-pessimistic connectivity check
Junio C Hamano
Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8 * dw/gitweb-doc-grammo: Documentation/gitweb: trivial English fixes
Junio C Hamano
Merge branch 'tr/cache-tree' into maint-1.7.8 * tr/cache-tree: t0090: be prepared that 'wc -l' writes leading blanks reset: update cache-tree data when appropriate commit: write cache-tree data when writing index anyway Refactor cache_tree_update idiom from commit Test the current state of the cache-tree optimization Add test-scrap-cache-tree
Junio C Hamano
Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8 * cb/maint-t5541-make-server-port-portable: t5541: check error message against the real port number used remote-curl: Fix push status report when all branches fail
Junio C Hamano
Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8 * cn/maint-rev-list-doc: Documentation: use {asterisk} in rev-list-options.txt when needed
Junio C Hamano
Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8 * tr/maint-bundle-boundary: bundle: keep around names passed to add_pending_object() t5510: ensure we stay in the toplevel test dir t5510: refactor bundle->pack conversion
Junio C Hamano
Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8 * tr/maint-bundle-long-subject: t5704: match tests to modern style strbuf: improve strbuf_get*line documentation bundle: use a strbuf to scan the log for boundary commits bundle: put strbuf_readline_fd in strbuf.c with adjustments
Junio C Hamano
Merge branch 'ph/rerere-doc' into maint-1.7.8 * ph/rerere-doc: rerere: Document 'rerere remaining'
Junio C Hamano
Git 1.7.9.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9.6
Junio C Hamano
Merge branch 'jc/maint-merge-autoedit' into maint * jc/maint-merge-autoedit: merge: backport GIT_MERGE_AUTOEDIT support
Heiko Voigt
string-list: document that string_list_insert() inserts unique strings Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.9.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9.5
Junio C Hamano
Merge branch 'jn/maint-fast-import-empty-ls' into maint * jn/maint-fast-import-empty-ls: fast-import: don't allow 'ls' of path with empty components fast-import: leakfix for 'ls' of dirty trees
Junio C Hamano
Merge branch 'ph/rerere-doc' into maint * ph/rerere-doc: rerere: Document 'rerere remaining'
Junio C Hamano
Merge branch 'ms/maint-config-error-at-eol-linecount' into maint * ms/maint-config-error-at-eol-linecount: config: report errors at the EOL with correct line number
Mark Lodato
grep doc: add --break / --heading / -W to synopsis All of the other options were included in the synopsis, so it makes sense to include these as well. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Rodrigo Silva
Documentation: improve description of GIT_EDITOR and preference order Previously GIT_EDITOR was not listed in git(1) "Environment Variables" section, which could be very confusing to users. Include it in "other" subsection along with a link to git-var(1), since that is the page that fully describes all places where editor can be set and also their preference order. Also, git-var(1) did not say that hardcoded fallback 'vi' may have been changed at build time. A user…
Nelson Benitez Leon
documentation: fix alphabetic ordered list for git-rebase man page An alphabetic ordered list (a.) is converted to numerical in the man page (1.) so context comments naming 'a' were confusing, fix that by not using ordered list notation for 'a' anb 'b' items. Signed-off-by: Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es> Signed-off-by: Junio C Hamano <gitster@pobox.com>
D Waitzman
Documentation/gitweb: trivial English fixes Change "it's" to "its" where a possessive is intended. Also add two missing "the" that were noticed by Ben Walton. Signed-off-by: David Waitzman <djw@bbn.com>
Junio C Hamano
Merge branch 'maint-1.7.8' into maint * maint-1.7.8: t/Makefile: Use $(sort ...) explicitly where needed gitweb: Fix actionless dispatch for non-existent objects i18n of multi-line advice messages
Junio C Hamano
merge: backport GIT_MERGE_AUTOEDIT support Even though 1.7.9.x series does not open the editor by default when merging in general, it does do so in one occassion: when merging an annotated tag. And worse yet, there is no good way for older scripts to decline this. Backport the support for GIT_MERGE_AUTOEDIT environment variable from 1.7.10 track to help those stuck on 1.7.9.x maintenance track. Signed-off-by: Junio C Hamano <gitster@pobo…
Junio C Hamano
Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 * ks/sort-wildcard-in-makefile: t/Makefile: Use $(sort ...) explicitly where needed
Junio C Hamano
Merge branch 'jc/advise-i18n' into maint-1.7.8 * jc/advise-i18n: i18n of multi-line advice messages
  1. Prev
  2. Next