dc0db2c0b9 · matheusbsbs/matheus-bagliano

@@ -12,6 +12,10 @@ Merging two branches that have no common ancestor with "git merge" is

12 by default forbidden now to prevent creating such an unusual merge by

13 mistake.

14

15 +The output formats of "git log" that indents the commit log message by

16 +4 spaces now expands HT in the log message by default. You can use

17 +the "--no-expand-tabs" option to disable this.

18 +

19

20 Updates since v2.8

21 ------------------

@@ -51,12 +55,30 @@ UI, Workflows & Features

55 default, with an escape hatch "--allow-unrelated-histories" option

56 to be used in a rare event that merges histories of two projects

57 that started their lives independently.

54 - (merge e379fdf jc/merge-refuse-new-root later to maint).

58

59 * "git apply -v" learned to report paths in the patch that were

60 skipped via --include/--exclude mechanism or being outside the

61 current working directory.

59 - (merge 3f57944 nd/apply-report-skip later to maint).

62 +

63 + * Shell completion (in contrib/) updates.

64 +

65 + * The commit object name reported when "rebase -i" stops has been

66 + shortened.

67 +

68 + * "git worktree add" can be given "--no-checkout" option to only

69 + create an empty worktree without checking out the files.

70 +

71 + * "git mergetools" learned to drive ExamDiff.

72 +

73 + * "git pull --rebase" learned "--[no-]autostash" option, so that

74 + the rebase.autostash configuration variable set to true can be

75 + overridden from the command line.

76 +

77 + * When "git log" shows the log message indented by 4-spaces, the

78 + remainder of a line after a HT does not align in the way the author

79 + originally intended. The command now expands tabs by default in

80 + such a case, and allows the users to override it with a new option,

81 + "--no-expand-tabs".

82

83

84 Performance, Internal Implementation, Development Support etc.

@@ -92,6 +114,13 @@ Performance, Internal Implementation, Development Support etc.

114 * Build updates for MSVC.

115 (merge 0ef60af ss/msvc later to maint).

116

117 + * The repository set-up sequence has been streamlined (the biggest

118 + change is that there is no longer git_config_early()), so that we

119 + do not attempt to look into refs/* when we know we do not have a

120 + Git repository.

121 + (merge 274db84 jk/check-repository-format later to maint).

122 +

123 +

124 Also contains various documentation updates and code clean-ups.

125

126

@@ -145,6 +174,33 @@ notes for details).

174 which perhaps was the reason why nobody noticed it).

175 (merge b84e65d jv/merge-nothing-into-void later to maint).

176

177 + * When "git worktree" feature is in use, "git branch -d" allowed

178 + deletion of a branch that is checked out in another worktree,

179 + which was wrong.

180 + (merge f292244 ky/branch-d-worktree later to maint).

181 +

182 + * "git diff -M" used to work better when two originally identical

183 + files A and B got renamed to X/A and X/B by pairing A to X/A and B

184 + to X/B, but this was broken in the 2.0 timeframe.

185 + (merge ca4e3ca sg/diff-multiple-identical-renames later to maint).

186 +

187 + * "git send-pack --all <there>" was broken when its command line

188 + option parsing was written in the 2.6 timeframe.

189 + (merge c677756 sk/send-pack-all-fix later to maint).

190 +

191 + * "git format-patch --help" showed `-s` and `--no-patch` as if these

192 + are valid options to the command. We already hide `--patch` option

193 + from the documentation, because format-patch is about showing the

194 + diff, and the documentation now hides these options as well.

195 + (merge b73a1bc es/format-patch-doc-hide-no-patch later to maint).

196 +

197 + * When running "git blame $path" with unnormalized data in the index

198 + for the path, the data in the working tree was blamed, even though

199 + "git add" would not have changed what is already in the index, due

200 + to "safe crlf" that disables the line-end conversion. It has been

201 + corrected.

202 + (merge a08feb8 tb/blame-force-read-cache-to-workaround-safe-crlf later to maint).

203 +

204 * Other minor clean-ups and documentation updates

205 (merge aed7480 mm/lockfile-error-message later to maint).

206 (merge bfee614 jc/index-pack later to maint).

@@ -155,3 +211,10 @@ notes for details).

211 (merge 16a86d4 nd/apply-doc later to maint).

212 (merge c3f6b85 pb/opt-cmdmode-doc later to maint).

213 (merge 30211fb oa/doc-diff-check later to maint).

214 + (merge 01d98e8 ak/use-hashmap-iter-first-in-submodule-config later to maint).

215 + (merge 8b5a3e9 kn/for-each-tag-branch later to maint).

216 + (merge 9c60d9f sb/misc-cleanups later to maint).

217 + (merge 7a6a44c cc/apply later to maint).

218 + (merge 8e9b208 js/mingw-tests-2.8 later to maint).

219 + (merge d55de70 jc/makefile-redirection-stderr later to maint).

220 + (merge 4232b21 ep/trace-doc-sample-fix later to maint).

Fourth batch for post 2.8 cycle