@matheusbsbs / matheus-bagliano / commits / f4eb1b7f4f

What's in/cooking updates

Junio C Hamano committed Apr 29, 2009 at 22:10 UTC f4eb1b7f4fdf415e73bf25158cd4957a20b2554d
2 files changed +559
whats/cooking/2009/04/04.txt new
+277
@@ -0,0 +1,277 @@
1 +To: git@vger.kernel.org
2 +Subject: What's cooking in git.git (Apr 2009, #04; Wed, 29)
3 +X-master-at: 6ffd567bec439e7809ee0966556bd5e72fb78de4
4 +X-next-at: 8c6980a6544dcc03e45b1d63d624544f3bfa1b94
5 +
6 +What's cooking in git.git (Apr 2009, #04; Wed, 29)
7 +--------------------------------------------------
8 +
9 +Here are the topics that have been cooking. Commits prefixed with '-' are
10 +only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11 +marked with '.' do not appear in any of the branches, but I am still
12 +holding onto them.
13 +
14 +The topics list the commits in reverse chronological order. The topics
15 +meant to be merged to the maintenance series have "maint-" in their names.
16 +
17 +----------------------------------------------------------------
18 +[New Topics]
19 +
20 +* cc/bisect (Fri Apr 24 08:29:01 2009 +0200) 10 commits
21 + - am: simplify "sq" function by using "git rev-parse --sq-quote"
22 + - bisect: use "git rev-parse --sq-quote" instead of a custom "sq"
23 + function
24 + - rev-parse: add --sq-quote to shell quote arguments
25 + - rev-list: remove stringed output flag from "show_bisect_vars"
26 + - bisect--helper: remove "--next-vars" option as it is now useless
27 + - bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
28 + - bisect--helper: add "--next-exit" to output bisect results
29 + - bisect: move common bisect functionality to "bisect_common"
30 + - rev-list: refactor printing bisect vars
31 + - rev-list: make "estimate_bisect_steps" non static
32 +
33 +* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits
34 + + bash completion: show-branch color support
35 + + show-branch: color the commit status signs
36 +
37 +* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit
38 + + graph API: Use horizontal lines for more compact graphs
39 +
40 +* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit
41 + - Clarify kind of conflict in merge-one-file helper
42 +
43 +* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit
44 + - diff: do not color --stat output like patch context
45 +
46 +* rc/http-push (Sat Apr 25 00:35:57 2009 +0800) 3 commits
47 + . http-push: send out fetch requests on queue
48 + . t5540-http-push: test fetching of packed objects
49 + . t5540-http-push: test fetching of loose objects
50 +
51 +Breaks build in a trivial way; which I haven't got around fixing it up.
52 +
53 +* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit
54 + + fetch: Strip usernames from url's before storing them
55 +
56 +* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits
57 + - print unlink(2) errno in copy_or_link_directory
58 + - replace direct calls to unlink(2) with unlink_or_warn
59 + - Introduce an unlink(2) wrapper which gives warning if unlink
60 + failed
61 +
62 +* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
63 + - git-submodule: add support for --rebase.
64 +
65 +----------------------------------------------------------------
66 +[Graduated to "master"]
67 +
68 +It's been a while since I sent "What's cooking" out, and some of the
69 +topics below have fixes on top directly applied since they graduated.
70 +
71 +* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit
72 + + graph API: Added logic for colored edges
73 +
74 +* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits
75 + + docs/checkout: clarify what "non-branch" means
76 + + doc/checkout: split checkout and branch creation in synopsis
77 + + doc/checkout: refer to git-branch(1) as appropriate
78 + + doc: refer to tracking configuration as "upstream"
79 + + doc: clarify --no-track option
80 +
81 +* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits
82 + + builtin-apply: keep information about files to be deleted
83 + + tests: test applying criss-cross rename patch
84 +
85 +Perhaps needs to be cherry-picked to 1.6.2.X series as well.
86 +
87 +* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
88 + + git add -p: new "quit" command at the prompt.
89 +
90 +* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
91 + + git-shell: Add 'git-upload-archive' to allowed commands.
92 +
93 +* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
94 + + Mark t1301 permission test to depend on POSIXPERM
95 + + t1301-shared-repo: fix forced modes test
96 +
97 +* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit
98 + + t1301-shared-repo: fix forced modes test
99 +
100 +* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
101 + + git-am: teach git-am to apply a patch to an unborn branch
102 +
103 +* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits
104 + + rev-parse: --abbrev-ref option to shorten ref name
105 + + for-each-ref: utilize core.warnAmbiguousRefs for :short-format
106 + + shorten_unambiguous_ref(): add strict mode
107 +
108 +* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
109 + + mergetool--lib: simplify API usage by removing more global
110 + variables
111 + + Fix misspelled mergetool.keepBackup
112 + + difftool/mergetool: refactor commands to use git-mergetool--lib
113 + + mergetool: use $( ... ) instead of `backticks`
114 + + bash completion: add git-difftool
115 + + difftool: add support for a difftool.prompt config variable
116 + + difftool: add various git-difftool tests
117 + + difftool: move 'git-difftool' out of contrib
118 + + difftool/mergetool: add diffuse as merge and diff tool
119 + + difftool: add a -y shortcut for --no-prompt
120 + + difftool: use perl built-ins when testing for msys
121 + + difftool: remove the backup file feature
122 + + difftool: remove merge options for opendiff, tkdiff, kdiff3 and
123 + xxdiff
124 + + git-mergetool: add new merge tool TortoiseMerge
125 + + git-mergetool/difftool: make (g)vimdiff workable under Windows
126 + + doc/merge-config: list ecmerge as a built-in merge tool
127 +
128 +* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
129 + + Allow users to un-configure rename detection
130 +
131 +* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
132 + + show_object(): push path_name() call further down
133 + + process_{tree,blob}: show objects without buffering
134 +
135 +* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits
136 + + archive test: test new --fix-attributes feature
137 + + archive: do not read .gitattributes in working directory
138 + + unpack-trees: do not muck with attributes when we are not checking
139 + out
140 + + attr: add GIT_ATTR_INDEX "direction"
141 + + archive tests: do not use .gitattributes in working directory
142 +
143 +----------------------------------------------------------------
144 +[Stalled and may need help and prodding to go forward]
145 +
146 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
147 + - blame.c: start libifying the blame infrastructure
148 +
149 +A few minor point remains in this initial one. I hate to do these minor
150 +fix-ups myself, but I may end up doing so...
151 +
152 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
153 + - Allow --date=local --date=other-format to work as expected
154 +
155 +The one I posted had a few corner-case bugs that was caught with the test
156 +suite; this one has them fixed. People did not like the UI so it is kept
157 +out of 'next'
158 +
159 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
160 + - git-merge-file: allow converting the results for the work tree
161 +
162 +This is a feature waiting for a user.
163 +
164 +We did not give scripted Porcelains a way to say "this temporary file I am
165 +using for merging is for this path, so use the core.autocrlf and attributes
166 +rules for that final path". Instead, merge-file simply wrote out the
167 +data in the canonical repository representation.
168 +
169 +rerere has the same issue, but it is a lot worse. It reads the three
170 +files (preimage, postimage and thisimage) from the work tree in the work
171 +tree representation, merges them without converting them to the canonical
172 +representation first but inserts the conflict markers with the canonical
173 +representation and writes the resulting mess out. It needs to be fixed to
174 +read with convert_to_git(), merge them while they are still in the
175 +canonical representation and possibly add conflict markers, and then write
176 +the results out after convert_to_working_tree(). It also needs to write
177 +in binary mode as well.
178 +
179 +* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
180 + - Add option for using a foreign VCS
181 + - Document details of transport function APIs
182 + - Allow late reporting of fetched hashes
183 +
184 +* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
185 + - Documentation: fix 'linkgit' macro in "git-notes.txt"
186 + - tests: fix "export var=val"
187 + - notes: refuse to edit notes outside refs/notes/
188 + - t3301: use test_must_fail instead of !
189 + - t3301: fix confusing quoting in test for valid notes ref
190 + - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
191 + - notes: only clean up message file when editing
192 + - handle empty notes gracefully
193 + - git notes show: test empty notes
194 + - git-notes: fix printing of multi-line notes
195 + - notes: fix core.notesRef documentation
196 + - Add an expensive test for git-notes
197 + - Speed up git notes lookup
198 + - Add a script to edit/inspect notes
199 + - Introduce commit notes
200 +
201 +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits
202 + - t/t9600: remove exit after test_done
203 + - cvsimport: extend testcase about patchset order to contain
204 + branches
205 + - cvsimport: add test illustrating a bug in cvsps
206 + + Add a test of "git cvsimport"'s handling of tags and branches
207 + + Add some tests of git-cvsimport's handling of vendor branches
208 + + Test contents of entire cvsimported "master" tree contents
209 + + Use CVS's -f option if available (ignore user's ~/.cvsrc file)
210 + + Start a library for cvsimport-related tests
211 +
212 +Two cvsimport test topics were rewound from 'next' and merged into this
213 +one. I'll keep this in 'pu' so that people can polish their cvsps skilz
214 +to resolve issues these tests identify.
215 +
216 +----------------------------------------------------------------
217 +[Actively cooking]
218 +
219 +* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
220 + - send-email: Remove superfluous `my $editor = ...'
221 + - send-email: 'References:' should only reference what is sent
222 + - send-email: Handle "GIT:" rather than "GIT: " during --compose
223 + - Docs: send-email: --smtp-server-port can take symbolic ports
224 + - Docs: send-email: Refer to CONFIGURATION section for
225 + sendemail.multiedit
226 + - Docs: send-email: Put options back into alphabetical order
227 +
228 +Only partially queued, but this is not 1.6.3 material and we are not in a
229 +hurry.
230 +
231 +* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits
232 + + t3702: fix reliance on SHELL_PATH being '/bin/sh'
233 + + git-add: introduce --edit (to edit the diff vs. the index)
234 +
235 +* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
236 + - Documentation: add documentation for "git replace"
237 + - Add git-replace to .gitignore
238 + - builtin-replace: use "usage_msg_opt" to give better error messages
239 + - parse-options: add new function "usage_msg_opt"
240 + - builtin-replace: teach "git replace" to actually replace
241 + - Add new "git replace" command
242 + - environment: add global variable to disable replacement
243 + - mktag: call "check_sha1_signature" with the replacement sha1
244 + - replace_object: add a test case
245 + - object: call "check_sha1_signature" with the replacement sha1
246 + - sha1_file: add a "read_sha1_file_repl" function
247 + - replace_object: add mechanism to replace objects found in
248 + "refs/replace/"
249 + - refs: add a "for_each_replace_ref" function
250 +
251 +I suspect an attempt to replace an object that is directly listed on the
252 +command line would not work very well with this series.
253 +
254 +----------------------------------------------------------------
255 +[Reverted]
256 +
257 +* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
258 + + Add a test of "git cvsimport"'s handling of tags and branches
259 + + Add some tests of git-cvsimport's handling of vendor branches
260 + + Test contents of entire cvsimported "master" tree contents
261 + + Use CVS's -f option if available (ignore user's ~/.cvsrc file)
262 + + Start a library for cvsimport-related tests
263 +
264 +This has been reverted out of 'next' for some time now.
265 +
266 +----------------------------------------------------------------
267 +[On Hold]
268 +
269 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
270 + - receive-pack: default receive.denyDeleteCurrent to refuse
271 +
272 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
273 + - Refuse updating the current branch in a non-bare repository via
274 + push
275 +
276 +These are for 1.7.0, but the messages when they trigger together may need
277 +to be rethought.
whats/in/2009/04/02.txt new
+282
@@ -0,0 +1,282 @@
1 +To: git@vger.kernel.org
2 +Subject: What's in git.git (Apr 2009, #02; Wed, 29)
3 +X-maint-at: a2dc04ba159def766ee17db00c60bdbda477955d
4 +X-master-at: 6ffd567bec439e7809ee0966556bd5e72fb78de4
5 +X-maint-was: 3bd1bb327eb4d3e386800897734f9f42b48280ff
6 +X-master-was: c965c029330b1f81cc107c5d829e7fd79c61d8ea
7 +
8 +What's in git.git (Apr 2009, #02; Wed, 29)
9 +
10 + maint a2dc04b (Merge branch 'maint-1.6.1' into maint)
11 + master 6ffd567 (improve error message in config.c)
12 +------------------------------------------------------------------------
13 +
14 +It's been a while since I sent the "What's in" report. Hopefully we can
15 +do an -rc4 this weekend and then 1.6.3 final next week.
16 +
17 +* The 'maint' branch has these fixes since 1.6.2.3
18 +
19 +Allan Caffee (2):
20 + builtin-merge: fix a typo in an error message
21 + Documentation: fix a grammatical error in api-builtin.txt
22 +
23 +Björn Steinbrink (1):
24 + tree_entry_interesting: a pathspec only matches at directory boundary
25 +
26 +Clemens Buchacher (3):
27 + add tests for merging with submodules
28 + update cache for conflicting submodule entries
29 + simplify output of conflicting merge
30 +
31 +Erik Faye-Lund (4):
32 + test-suite: adding a test for fast-export with tag variants
33 + builtin-fast-export.c: turn error into warning
34 + builtin-fast-export.c: fix crash on tagged trees
35 + builtin-fast-export.c: handle nested tags
36 +
37 +Frank Lichtenheld (2):
38 + init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
39 + gitcvs-migration: Link to git-cvsimport documentation
40 +
41 +Jeff King (2):
42 + doc/gitattributes: clarify location of config text
43 + add-interactive: refactor mode hunk handling
44 +
45 +Johan Herland (1):
46 + Update docs on behaviour of 'core.sharedRepository' and 'git init
47 + --shared'
48 +
49 +Johannes Schindelin (2):
50 + Fix 'git checkout <submodule>' to update the index
51 + Fix off-by-one in read_tree_recursive
52 +
53 +Johannes Sixt (1):
54 + t1301-shared-repo: fix forced modes test
55 +
56 +Junio C Hamano (4):
57 + match_tree_entry(): a pathspec only matches at directory boundaries
58 + Describe fixes since 1.6.2.3
59 + GIT 1.6.2.4
60 + diff -c -p: do not die on submodules
61 +
62 +Junio Hamano (1):
63 + Speed up reflog pruning of unreachable commits
64 +
65 +Linus Torvalds (2):
66 + Clean up reflog unreachability pruning decision
67 + grep: fix segfault when "git grep '('" is given
68 +
69 +Markus Heidelberg (2):
70 + doc/git-daemon: add missing arguments to options
71 + doc/git-daemon: add missing arguments to max-connections option
72 +
73 +Matthieu Moy (2):
74 + git add -p: new "quit" command at the prompt.
75 + Update git-add.txt according to the new possibilities of 'git add -p'.
76 +
77 +Nguyễn Thái Ngọc Duy (1):
78 + Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
79 +
80 +Paul Bolle (1):
81 + imap-send: use correct configuration variable in documentation
82 +
83 +Stephen Boyd (1):
84 + test-genrandom: Add newline to usage string
85 +
86 +Thomas Jarosch (1):
87 + Fix buffer overflow in config parser
88 +
89 +Ulrich Windl (1):
90 + git-apply: fix option description
91 +
92 +
93 +* The 'master' branch has these since 1.6.3-rc0
94 + in addition to the above.
95 +
96 +Alex Riesen (3):
97 + Wait for git diff to finish in git difftool
98 + Explain seemingly pointless use of system in difftool
99 + improve error message in config.c
100 +
101 +Allan Caffee (4):
102 + graph API: Added logic for colored edges
103 + t4202-log: extend test coverage of graphing
104 + graph API: fix extra space during pre_commit_line state
105 + graph API: fix a bug in the rendering of octopus merges
106 +
107 +Ben Jackson (1):
108 + Work around ash "alternate value" expansion bug
109 +
110 +Benjamin Kramer (2):
111 + connect: replace inet_ntop with getnameinfo
112 + daemon.c: fix segfault on OS X
113 +
114 +Bert Wesarg (3):
115 + shorten_unambiguous_ref(): add strict mode
116 + for-each-ref: utilize core.warnAmbiguousRefs for :short-format
117 + rev-parse: --abbrev-ref option to shorten ref name
118 +
119 +Bill Pemberton (1):
120 + Add parsing of elm aliases to git-send-email
121 +
122 +Brandon Casey (2):
123 + t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
124 + t7700-repack: repack -a now works properly, expect success from test
125 +
126 +Dan Loewenherz (1):
127 + Convert to use quiet option when available
128 +
129 +David Aguilar (11):
130 + difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
131 + difftool: remove the backup file feature
132 + difftool: use perl built-ins when testing for msys
133 + difftool: add a -y shortcut for --no-prompt
134 + difftool: move 'git-difftool' out of contrib
135 + difftool: add various git-difftool tests
136 + difftool: add support for a difftool.prompt config variable
137 + bash completion: add git-difftool
138 + mergetool: use $( ... ) instead of `backticks`
139 + difftool/mergetool: refactor commands to use git-mergetool--lib
140 + mergetool--lib: simplify API usage by removing more global variables
141 +
142 +Eric Blake (2):
143 + Makefile: installing git in cygwin 1.7.0
144 + doc: consistently use ASCIIDOC_EXTRA
145 +
146 +Erik Broes (1):
147 + git-shell: Add 'git-upload-archive' to allowed commands.
148 +
149 +Felipe Contreras (1):
150 + git config: error when editing a repo config and not being in one
151 +
152 +Ferry Huberts (1):
153 + Fix misspelled mergetool.keepBackup
154 +
155 +Holger Weiß (1):
156 + gitweb: Fix snapshots requested via PATH_INFO
157 +
158 +Jeff King (8):
159 + doc: clarify --no-track option
160 + doc: refer to tracking configuration as "upstream"
161 + doc/checkout: refer to git-branch(1) as appropriate
162 + doc/checkout: split checkout and branch creation in synopsis
163 + docs/checkout: clarify what "non-branch" means
164 + add-interactive: refactor mode hunk handling
165 + t7800: respect NO_PERL
166 + Makefile: fix NO_PERL bug with gitweb
167 +
168 +Johannes Schindelin (3):
169 + Add an option not to use link(src, dest) && unlink(src) when that is
170 + unreliable
171 + t5701: do not get stuck in empty-push/
172 + Rename core.unreliableHardlinks to core.createObject
173 +
174 +Johannes Sixt (5):
175 + Windows: Work around intermittent failures in mingw_rename
176 + Windows: Skip fstat/lstat optimization in write_entry()
177 + builtin-help: silently tolerate unknown keys
178 + remote.c: do not trigger remote.<name>.<var> codepath for two-level names
179 + prune-packed: advanced progress even for non-existing fan-out directories
180 +
181 +Junio C Hamano (11):
182 + gitignore git-bisect--helper
183 + unpack-trees: do not muck with attributes when we are not checking out
184 + Update draft release notes to 1.6.3
185 + read-tree A B: do not corrupt cache-tree
186 + Move prime_cache_tree() to cache-tree.c
187 + read-tree -m A B: prime cache-tree from the switched-to tree
188 + checkout branch: prime cache-tree fully
189 + Revert "stat_tracking_info(): only count real commits"
190 + Makefile: ignore perl/ subdirectory under NO_PERL
191 + GIT 1.6.3-rc2
192 + merge-recursive: do not die on a conflicting submodule
193 +
194 +Linus Torvalds (4):
195 + Allow users to un-configure rename detection
196 + process_{tree,blob}: show objects without buffering
197 + show_object(): push path_name() call further down
198 + t4202: fix typo
199 +
200 +Mark Drago (1):
201 + Add semicolon to curly brace group in main Makefile
202 +
203 +Markus Heidelberg (4):
204 + doc/merge-config: list ecmerge as a built-in merge tool
205 + git-mergetool/difftool: make (g)vimdiff workable under Windows
206 + git-mergetool: add new merge tool TortoiseMerge
207 + grep: don't support "grep.color"-like config options
208 +
209 +Matthieu Moy (3):
210 + git add -p: new "quit" command at the prompt.
211 + Update git-add.txt according to the new possibilities of 'git add -p'.
212 + clone: add test for push on an empty clone.
213 +
214 +Michael J Gruber (3):
215 + remote.c: use shorten_unambiguous_ref
216 + test-lib.sh: Help test_create_repo() find the templates dir
217 + Fix more typos/spelling in comments
218 +
219 +Michał Kiedrowicz (6):
220 + tests: test applying criss-cross rename patch
221 + builtin-apply: keep information about files to be deleted
222 + Documentation: boolean value may be given by on/off
223 + tests: test applying criss-cross rename patch
224 + builtin-apply: keep information about files to be deleted
225 + tests: make test-apply-criss-cross-rename more robust
226 +
227 +Mike Ralphson (3):
228 + builtin-remote: fix typo in option description
229 + Documentation: fix typos / spelling mistakes
230 + Fix typos / spelling in comments
231 +
232 +Nanako Shiraishi (1):
233 + git-am: teach git-am to apply a patch to an unborn branch
234 +
235 +Nguyễn Thái Ngọc Duy (3):
236 + get_local_heads(): do not return random pointer if there is no head
237 + attr: add GIT_ATTR_INDEX "direction"
238 + archive: do not read .gitattributes in working directory
239 +
240 +Nicolas Pitre (1):
241 + progress bar: round to the nearest instead of truncating down
242 +
243 +Patrick Welche (1):
244 + NetBSD compilation fix
245 +
246 +Pierre Habouzit (1):
247 + hook/update: example of how to prevent branch creation
248 +
249 +René Scharfe (2):
250 + archive tests: do not use .gitattributes in working directory
251 + archive test: attributes
252 +
253 +Sam Vilain (1):
254 + SubmittingPatches: itemize and reflect upon well written changes
255 +
256 +Sebastian Pipping (1):
257 + difftool/mergetool: add diffuse as merge and diff tool
258 +
259 +Sitaram Chamarty (1):
260 + Remove obsolete bug warning in man git-update-server-info
261 +
262 +Stephen Boyd (7):
263 + config.txt: add missing format.{subjectprefix,cc,attach} variables
264 + Documentation: use lowercase for shallow and deep threading
265 + git-show-branch.txt: cleanup example description
266 + git-format-patch.txt: general rewordings and cleanups
267 + config.txt: add missing 'the's and make words plural
268 + config.txt: clarify sentences in the configuration and syntax sections
269 + config.txt: Make configuration paragraph more consistent
270 +
271 +Uwe Kleine-König (1):
272 + parseopt: fix documentation for --keep-dashdash
273 +
274 +Wesley J. Landaker (4):
275 + Documentation: git-svn: fix spurious bolding that mangles the output
276 + Documentation: git-svn: fix a grammatical error without awkwardness
277 + Documentation: git-clean: fix minor grammatical errors
278 + Documentation: git-clean: make description more readable
279 +
280 +Wincent Colaiuta (1):
281 + git add -p: add missing "q" to patch prompt
282 +