1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Merge branch 'nd/doc-ignore' into maint * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
Junio C Hamano
Merge branch 'jc/doc-long-options' into maint * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
Junio C Hamano
Merge branch 'jc/maint-t1450-fsck-order-fix' into maint * jc/maint-t1450-fsck-order-fix: t1450: the order the objects are checked is undefined
Junio C Hamano
Merge branch 'rr/test-use-shell-path-not-shell' into maint * rr/test-use-shell-path-not-shell: test-lib: use $SHELL_PATH, not $SHELL
Junio C Hamano
Merge branch 'rr/test-make-sure-we-have-git' into maint * rr/test-make-sure-we-have-git: t/test-lib: make sure Git has already been built
Junio C Hamano
Merge branch 'po/maint-docs' into maint * po/maint-docs: Doc branch: show -vv option and alternative Doc clean: add See Also link Doc add: link gitignore Doc: separate gitignore pattern sources Doc: shallow clone deepens _to_ new depth
Junio C Hamano
Merge branch 'jc/ll-merge-binary-ours' into maint * jc/ll-merge-binary-ours: ll-merge: warn about inability to merge binary files only when we can't attr: "binary" attribute should choose built-in "binary" merge driver merge: teach -Xours/-Xtheirs to binary ll-merge driver
Junio C Hamano
Merge branch 'db/doc-custom-xmlto' into maint * db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary
Jiang Xin
Merge branch 'master' of https://github.com/nafmo/git-l10n-sv * 'master' of https://github.com/nafmo/git-l10n-sv: l10n: Update Swedish translation (1964t0f0u)
Jiang Xin
Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update from v1.8.0-rc2-4-g42e55
Tran Ngoc Quan
l10n: vi.po: update from v1.8.0-rc2-4-g42e55 * translate 3 new messages * review quotes Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Thomas Ackermann
Documentation/RelNotes: remove "updated up to this revision" markers These were used to keep track of the last commit a release notes entry was written for, and should have been removed when cutting the final release. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.8.0 We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/maint-http-half-auth-push' Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1) and master (v1.8.0-rc0). * jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result
René Scharfe
refs: lock symref that is to be deleted, not its target When delete_ref is called on a symref then it locks its target and then either deletes the target or the symref, depending on whether the flag REF_NODEREF was set in the parameter delopt. Instead, simply pass the flag to lock_ref_sha1_basic, which will then either lock the target or the symref, and delete the locked ref. This reimplements part of eca35a25 (Fix git branch -m for symrefs.). Signe…
Peter Krefting
l10n: Update Swedish translation (1964t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Jiang Xin
l10n: Update git.pot (3 new, 6 removed messages) This po/git.pot update is generated from v1.8.0-rc2-4-g42e55. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin
Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update translation upto cc76011
Tran Ngoc Quan
l10n: vi.po: update translation upto cc76011 * translate all new messages (100%) * review some others Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Junio C Hamano
Merge branch 'maint' * maint: Fix spelling error in post-receive-email hook
Richard Fearn
Fix spelling error in post-receive-email hook Signed-off-by: Richard Fearn <richardfearn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: gitweb.cgi: fix "comitter_tz" typo in feed
Jeff King
http: fix segfault in handle_curl_result When we create an http active_request_slot, we can set its "results" pointer back to local storage. The http code will fill in the details of how the request went, and we can access those details even after the slot has been cleaned up. Commit 8809703 (http: factor out http error code handling) switched us from accessing our local results struct directly to accessing it via the "results" pointer …
Dylan Alex Simon
gitweb.cgi: fix "comitter_tz" typo in feed gitweb's feeds sometimes contained committer timestamps in the wrong timezone due to a misspelling. Signed-off-by: Dylan Simon <dylan@dylex.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy
grep: stop looking at random places for .gitattributes grep searches for .gitattributes using "name" field in struct grep_source but that field is not real on-disk path name. For example, "grep pattern rev" fills the field with "rev:path", and Git looks for .gitattributes in the (non-existent but exploitable) path "rev:path" instead of "path". This patch passes real paths down to grep_source_load_driver() when: - grep on work tree - grep on the in…
David Aguilar
mergetools/p4merge: Handle "/dev/null" p4merge does not properly handle the case where "/dev/null" is passed as a filename. Work it around by creating a temporary file for this purpose. Reported-by: Jeremy Morton <admin@game-point.net> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Needs to be amended with Tested-by when a report comes...
Junio C Hamano
Git 1.8.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0-rc2
Junio C Hamano
test-lib: Fix say_color () not to interpret \a\b\c in the message When running with color disabled (e.g. under prove to produce TAP output), say_color() helper function is defined to use echo to show the message. With a message that ends with "\c", echo is allowed to interpret it as "Do not end the line with LF". Use printf "%s\n" to emit the message literally. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'rr/git-uri-doc' * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
Junio C Hamano
Merge branch 'bw/cp-a-is-gnuism' * bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism
  1. Prev
  2. Next