git/builtin, branch v2.4.4Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.4.42015-06-16T21:33:52ZMerge branch 'jk/clone-dissociate' into maint2015-06-16T21:33:52ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:52Zurn:sha1:37d6f933dff7d5c295870c85399f5fd22072643a
Code clean-up.
* jk/clone-dissociate:
clone: reorder --dissociate and --reference options
clone: use OPT_STRING_LIST for --reference
Merge branch 'ah/usage-strings' into maint2015-06-16T21:33:50ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:50Zurn:sha1:6588f82ff6aa8ff7857304c10b18ab062e67bb52
A few usage string updates.
* ah/usage-strings:
blame, log: format usage strings similarly to those in documentation
Merge branch 'rs/janitorial' into maint2015-06-16T21:33:47ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:47Zurn:sha1:dfb67594e964e63f20546361597c06432c73779d
Code clean-up.
* rs/janitorial:
dir: remove unused variable sb
clean: remove unused variable buf
use file_exists() to check if a file exists in the worktree
Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint2015-06-16T21:33:46ZJunio C Hamanogitster@pobox.com2015-06-16T21:33:46Zurn:sha1:6b2c0ead061b1bb9ce8e4b539da495ea0ef057b5
"git clean pathspec..." tried to lstat(2) and complain even for
paths outside the given pathspec.
* dt/clean-pathspec-filter-then-lstat:
clean: only lstat files in pathspec
Merge branch 'dl/branch-error-message' into maint2015-06-05T19:00:29ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:29Zurn:sha1:cbac7067a406380dd0061ecdd990a5e64ca88abf
Error messages from "git branch" called remote-tracking branches as
"remote branches".
* dl/branch-error-message:
branch: do not call a "remote-tracking branch" a "remote branch"
Merge branch 'ps/bundle-verify-arg' into maint2015-06-05T19:00:18ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:18Zurn:sha1:51f319c08f55beb12cf1e1d4db9299434b9b1496
"git bundle verify" did not diagnose extra parameters on the
command line.
* ps/bundle-verify-arg:
bundle: verify arguments more strictly
Merge branch 'jk/add-e-kill-editor' into maint2015-06-05T19:00:09ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:09Zurn:sha1:8d5ef5a0d1da18a2eb55c976720a8e96642c1b0b
"git add -e" did not allow the user to abort the operation by
killing the editor.
* jk/add-e-kill-editor:
add: check return value of launch_editor
Merge branch 'mh/clone-verbosity-fix' into maint2015-06-05T19:00:08ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:08Zurn:sha1:a3821a1ae5580ac9788d866c292376070d3e5133
Git 2.4 broke setting verbosity and progress levels on "git clone"
with native transports.
* mh/clone-verbosity-fix:
clone: call transport_set_verbosity before anything else on the newly created transport
Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint2015-06-05T19:00:07ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:07Zurn:sha1:3c91e9966aae9ad73a27f7066551b2861d8c8849
* jk/sha1-file-reduce-useless-warnings:
sha1_file: squelch "packfile cannot be accessed" warnings
Merge branch 'tb/blame-resurrect-convert-to-git' into maint2015-06-05T19:00:06ZJunio C Hamanogitster@pobox.com2015-06-05T19:00:06Zurn:sha1:1d93ec93970d73e57c37dffd2108dbd01761cb2c
Some time ago, "git blame" (incorrectly) lost the convert_to_git()
call when synthesizing a fake "tip" commit that represents the
state in the working tree, which broke folks who record the history
with LF line ending to make their project portabile across
platforms while terminating lines in their working tree files with
CRLF for their platform.
* tb/blame-resurrect-convert-to-git:
blame: CRLF in the working tree and LF in the repo