1 Version v1.8.5-rc0; changes since v1.8.4.2:
2 -------------------------------------------
5 git-p4: Fix occasional truncation of symlink contents.
8 remote-hg: fix path when cloning with tilde expansion
11 reset: rename update_refs to reset_refs
12 refs: report ref type from lock_any_ref_for_update
13 refs: factor update_ref steps into helpers
14 refs: factor delete_ref loose ref step into a helper
15 refs: add function to repack without multiple refs
16 refs: add update_refs for multiple simultaneous updates
17 update-ref: support multiple simultaneous updates
18 update-ref: add test cases covering --stdin signature
21 sha1_file: introduce close_one_pack() to close packs on fd pressure
22 Don't close pack fd when free'ing pack windows
23 contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations
24 contrib/git-credential-gnome-keyring.c: remove unused die() function
25 contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.
26 contrib/git-credential-gnome-keyring.c: add static where applicable
27 contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly
28 contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t
29 contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing
30 contrib/git-credential-gnome-keyring.c: set Gnome application name
31 contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()
32 contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds
33 contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords
34 contrib/git-credential-gnome-keyring.c: use glib memory allocation functions
35 contrib/git-credential-gnome-keyring.c: use glib messaging functions
36 contrib/git-credential-gnome-keyring.c: report failure to store password
37 contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring
38 contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring
41 Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
42 OS X: Fix redeclaration of die warning
43 t5551: Remove header from curl cookie file
44 t5570: Update for symref capability
45 t5570: Update for clone-progress-to-stderr branch
46 t5570: Update for clone-progress-to-stderr branch
49 replace: forbid replacing an object with one of a different type
50 Documentation/replace: state that objects must be of the same type
51 t6050-replace: test that objects are of the same type
52 t6050-replace: add test to clean up all the replace refs
53 Documentation/replace: add Creating Replacement Objects section
54 replace: allow long option names
55 t6050-replace: use some long option names
58 t0070: test that git_mkstemps correctly checks return value of open()
59 diff --no-index: clarify operation when not inside a repository
62 http: add http.savecookies option to write out HTTP cookies
65 check-ignore: Add option to ignore index contents
68 t8001/t8002: blame: decompose overly-large test
69 t8001/t8002: blame: demonstrate -L bounds checking bug
70 t8001/t8002: blame: add empty file & partial-line tests
71 blame: fix -L bounds checking bug
72 t4211: log: demonstrate -L bounds checking bug
73 t4211: retire soon-to-be unimplementable tests
74 log: fix -L bounds checking bug
75 t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0
76 blame: reject empty ranges -LX,+0 and -LX,-0
77 t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0
78 blame: reject empty ranges -L,+0 and -L,-0
79 git-log.txt: place each -L option variation on its own line
80 line-range-format.txt: clarify -L:regex usage form
81 range-set: publish API for re-use by git-blame -L
82 blame: inline one-line function into its lone caller
83 blame: accept multiple -L ranges
84 t8001/t8002: blame: add tests of multiple -L options
85 blame: document multiple -L support
86 line-range: teach -L/RE/ to search relative to anchor point
87 blame: teach -L/RE/ to search from end of previous -L range
88 log: teach -L/RE/ to search from end of previous -L range
89 line-range-format.txt: document -L/RE/ relative search
90 line-range: teach -L^/RE/ to search from start of file
91 line-range: teach -L:RE to search from end of previous -L range
92 line-range: teach -L^:RE to search from start of file
93 t8001/t8002: blame: add tests of -L line numbers less than 1
94 line-range: reject -L line numbers less than 1
95 contacts: validate hunk length earlier
96 contacts: gather all blame sources prior to invoking git-blame
97 contacts: reduce git-blame invocations
98 name-hash: refactor polymorphic index_name_exists()
99 employ new explicit "exists in index?" API
100 name-hash: stop storing trailing '/' on paths in index_state.dir_hash
101 dir: revert work-around for retired dangerous behavior
102 t7508: avoid non-portable sed expression
103 contacts: fix to work in subdirectories
106 http: enable keepalive on TCP sockets
108 Felipe Contreras (26):
109 remote-hg: ensure shared repo is initialized
110 remote-hg: add shared repo upgrade
111 unpack-trees: plug a memory leak
112 remote-bzr: fix export of utf-8 authors
113 remote-bzr: make bzr branches configurable per-repo
115 remote-hg: add missing &&s in the test
116 remote-hg: improve basic test
117 remote-helpers: trivial style fixes
118 remote-helpers: cleanup more global variables
119 remote-hg: use notes to keep track of Hg revisions
120 reset: trivial refactoring
121 branch: trivial style fix
122 reset: trivial style cleanup
123 add: trivial style cleanup
124 sha1-name: pass len argument to interpret_branch_name()
125 t: branch: trivial style fix
127 t: branch: fix broken && chains
128 fast-export: make extra_refs global
129 fast-export: refactor get_tags_and_duplicates()
130 rev-parse test: modernize quoting and whitespace
131 rev-parse test: use test_must_fail, not "if <command>; then false; fi"
132 rev-parse test: use standard test functions for setup
133 Add new @ shortcut for HEAD
134 alias: have SP around arithmetic operators
137 hooks/post-receive-email: set declared encoding to utf-8
140 graph: fix coloring around octopus merges
143 cherry-pick: allow "-" as abbreviation of '@{-1}'
146 l10n: fr.po: 2135/2135 messages translated
149 grep: allow to use textconv filters
150 clear parsed flag when we free tree buffers
151 cat-file: only split on whitespace when %(rest) is used
152 test-sha1: add a binary output mode
153 sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
154 add tests for indexing packs with delta cycles
155 test index-pack on packs with recoverable delta cycles
156 write_index: optionally allow broken null sha1s
157 pager: turn on "cat" optimization for DEFAULT_PAGER
158 peel_onion: do not assume length of x_type globals
159 t5308: check that index-pack --strict detects duplicate objects
160 config: factor out integer parsing from range checks
161 config: properly range-check integer values
162 config: set errno in numeric git_parse_* functions
163 config: make numeric parsing errors more clear
164 git-config: always treat --int as 64-bit internally
165 t5541: mark passing c-a-s test as success
166 http_get_file: style fixes
167 http_request: factor out curlinfo_strbuf
168 http: refactor options to http_get_*
169 cherry-pick: handle "-" after parsing options
170 http: hoist credential request out of handle_curl_result
171 http: provide effective url to callers
172 http: update base URLs when we see redirects
173 remote-curl: make refs_url a strbuf
174 remote-curl: store url as a strbuf
175 remote-curl: rewrite base url from info/refs redirects
176 split_ident: parse timestamp from end of line
177 remote: do not copy "origin" string literal
178 http: use curl's tcp keepalive if available
179 drop redundant semicolon in empty while
180 silence gcc array-bounds warning
183 mv: move submodules together with their work trees
184 mv: move submodules using a gitfile
185 submodule.c: add .gitmodules staging helper functions
186 mv: update the path entry in .gitmodules for moved submodules
187 rm: delete .gitmodules entry of submodules removed from the work tree
188 Improve documentation concerning the status.submodulesummary setting
191 Clear fd after closing to avoid double-close error
193 Jeremy Huddleston (1):
194 imap-send: use Apple's Security framework for base64 encoding
197 branch: report invalid tracking branch as gone
198 status: always show tracking branch even no change
199 documentation: clarify notes for clean.requireForce
200 test: use unambigous leading path (/foo) for MSYS
201 relative_path should honor dos-drive-prefix
202 Use simpler relative_path when set_git_dir
205 sample pre-commit hook: use --bool when retrieving config var
206 Documentation/git-svn: Promote the use of --prefix in docs + examples
207 git-svn: Warn about changing default for --prefix in Git v2.0
210 compat/mingw.h: define PRId64
213 t9300: document fast-import empty path issues
214 fast-import: set valid mode on root tree in "ls"
215 fast-import: allow ls or filecopy of the root tree
216 fast-import: allow moving the root tree
217 rev-parse: remove restrictions on some options
218 rev-parse(1): logically group options
219 git_remote_helpers: remove little used Python library
220 rm: re-use parse_pathspec's trailing-slash removal
221 reset: handle submodule with trailing slash
222 Documentation/Makefile: make AsciiDoc dblatex dir configurable
225 hooks/post-receive-email: use plumbing instead of git log/show
226 hooks/post-receive-email: force log messages in UTF-8
227 add -i test: use skip_all instead of repeated PERL prerequisite
228 reset test: modernize style
229 rev-parse test: use test_cmp instead of "test" builtin
230 status test: add missing && to <<EOF blocks
231 gc: remove gc.pid file at end of execution
234 git-prompt.sh: optionally show upstream branch name
237 pack-objects: shrink struct object_entry
238 diff_opt: track whether flags have been set explicitly
239 setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
240 cache.h: move remote/connect API out of it
241 builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN
242 check-ignore: the name of the character is NUL, not NULL
243 check-attr: the name of the character is NUL, not NULL
244 check-ignore -z: a single -z should apply to both input and output
245 check-attr -z: a single -z should apply to both input and output
246 diff: pass the whole diff_options to diffcore_apply_filter()
247 diff: factor out match_filter()
248 diff: preparse --diff-filter string argument
249 diff: reject unknown change class given to --diff-filter
250 diff: allow lowercase letter to specify what change class to exclude
251 diff: deprecate -q option to diff-files
252 remote.c: add command line option parser for "--force-with-lease"
253 push --force-with-lease: implement logic to populate old_sha1_expect[]
254 push --force-with-lease: tie it all together
255 t5533: test "push --force-with-lease"
256 parse-options: add OPT_CMDMODE()
258 http.c: fix parsing of http.sslCertPasswordProtected variable
259 config: add generic callback wrapper to parse section.<url>.key
260 t5540/5541: smart-http does not support "--force-with-lease"
261 send-pack: fix parsing of --force-with-lease option
262 push: teach --force-with-lease to smart-http transport
263 builtin/config: refactor collect_config()
264 config: "git config --get-urlmatch" parses section.<url>.key
265 builtin/config.c: compilation fix
266 core-tutorial: trim the section on Inspecting Changes
267 whatchanged: document its historical nature
268 diff --no-index: describe in a separate paragraph
269 config: rewrite core.pager documentation
270 Start the post-1.8.4 cycle
271 contrib/remote-helpers: style updates for test scripts
272 contrib/remote-helpers: quote variable references in redirection targets
273 Update draft release notes after merging the first batch of topics
274 typofix: commit is spelled with two ems
275 typofix: cherry is spelled with two ars
276 Update draft release notes to 1.8.5 for the second batch of topics
277 checkout: update synopsys and documentation on detaching HEAD
278 Update draft release notes to 1.8.5
279 mailmap: work around implementations with pure inline strcasecmp
280 Update draft release notes to 1.8.5 for the third batch of topics
281 Update draft release notes to 1.8.5 for the first half of the fourth batch
282 t5505: fix "set-head --auto with ambiguous HEAD" test
283 upload-pack.c: do not pass confusing cb_data to mark_our_ref()
284 upload-pack: send symbolic ref information as capability
285 upload-pack: send non-HEAD symbolic refs
286 connect.c: make parse_feature_value() static
287 connect: annotate refs with their symref information in get_remote_head()
288 clone: test the new HEAD detection logic
289 Update draft release notes to 1.8.5 for the fourth batch of topics
290 Update draft release notes to 1.8.5 for the fifth batch of topics
291 revision: do not peel tags used in range notation
292 C: have space around && and || operators
293 abspath.c: have SP around arithmetic operators
294 alloc.c: have SP around arithmetic operators
295 archive.c: have SP around arithmetic operators
296 base85.c: have SP around arithmetic operators
297 block-sha1/sha1.c: have SP around arithmetic operators
298 Update draft release notes to 1.8.5
299 Update draft release notes to 1.8.5
300 Update draft release notes to 1.8.5
301 Update draft release notes to 1.8.5
302 checkout_entry(): clarify the use of topath[] parameter
303 Almost -rc0 for 1.8.5
307 Make test "using invalid commit with -C" more strict
308 t/t7106-reset-unborn-branch.sh: Add PERL prerequisite
311 MSVC: fix compile errors due to missing libintl.h
312 MSVC: fix compile errors due to macro redefinitions
313 MSVC: fix stat definition hell
316 git p4: implement view spec wildcards with "p4 where"
319 git-svn.txt: fix AsciiDoc formatting error
320 git-svn.txt: reword description of gc command
321 git-svn.txt: replace .git with $GIT_DIR
322 git-svn.txt: elaborate on rev_map files
324 Kirill A. Shutemov (1):
325 rebase -i: respect core.abbrev
328 config: add helper to normalize and match URLs
329 config: parse http.<url>.<variable> using urlmatch
332 Allow git-filter-branch to process large repositories with lots of branches.
335 Provide some linguistic guidance for the documentation.
338 t6131 - skip tests if on case-insensitive file system
341 Documentation/fast-import: clarify summary for `feature` command
342 Documentation/remote-helpers: document common use-case for private ref
343 git-remote-mediawiki: add test and check Makefile targets
344 transport-helper: add no-private-update capability
345 git-remote-mediawiki: use no-private-update capability on dumb push
346 git-remote-mediawiki: no need to update private ref in non-dumb push
347 builtin/stripspace.c: fix broken indentation
348 wt-status: use argv_array API
349 submodule summary: ignore --for-status option
350 status: disable display of '#' comment prefix by default
351 tests: don't set status.displayCommentPrefix file-wide
352 status: add missing blank line after list of "other" files
353 commit: factor status configuration is a helper function
354 wt-status: turn advice_status_hints into a field of wt_status
355 commit: disable status hints when writing to COMMIT_EDITMSG
356 RelNotes/1.8.5: direct script writers to "git status --porcelain"
357 checkout: allow dwim for branch creation for "git checkout $branch --"
358 checkout: proper error message on 'git checkout foo bar --'
360 Michael J Gruber (5):
361 t4030: demonstrate behavior of show with textconv
362 show: honor --textconv for blobs
363 cat-file: do not die on --textconv without textconv filters
364 t7008: demonstrate behavior of grep with textconv
365 grep: honor --textconv for the case rev:path
367 Michael S. Tsirkin (1):
368 doc: don't claim that cherry calls patch-id
370 Michael Schubert (1):
371 fetch: make --prune configurable
373 Michal Nazarewicz (1):
374 remove dead pastebin link from pack-heuristics document
377 git: run in a directory given with -C option
378 t0056: "git -C" test updates
380 Nguyễn Thái Ngọc Duy (57):
381 clean: remove unused variable "seen"
382 move struct pathspec and related functions to pathspec.[ch]
383 pathspec: i18n-ize error strings in pathspec parsing code
384 pathspec: add copy_pathspec
385 add parse_pathspec() that converts cmdline args to struct pathspec
386 parse_pathspec: save original pathspec for reporting
387 parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} flags
388 convert some get_pathspec() calls to parse_pathspec()
389 parse_pathspec: add special flag for max_depth feature
390 parse_pathspec: support stripping submodule trailing slashes
391 parse_pathspec: support stripping/checking submodule paths
392 parse_pathspec: support prefixing original patterns
393 guard against new pathspec magic in pathspec matching code
394 clean: convert to use parse_pathspec
395 commit: convert to use parse_pathspec
396 status: convert to use parse_pathspec
397 rerere: convert to use parse_pathspec
398 checkout: convert to use parse_pathspec
399 rm: convert to use parse_pathspec
400 ls-files: convert to use parse_pathspec
401 archive: convert to use parse_pathspec
402 check-ignore: convert to use parse_pathspec
403 add: convert to use parse_pathspec
404 reset: convert to use parse_pathspec
405 line-log: convert to use parse_pathspec
406 convert read_cache_preload() to take struct pathspec
407 convert run_add_interactive to use struct pathspec
408 convert unmerge_cache to take struct pathspec
409 checkout: convert read_tree_some to take struct pathspec
410 convert report_path_error to take struct pathspec
411 convert refresh_index to take struct pathspec
412 convert {read,fill}_directory to take struct pathspec
413 convert add_files_to_cache to take struct pathspec
414 convert common_prefix() to use struct pathspec
415 remove diff_tree_{setup,release}_paths
416 remove init_pathspec() in favor of parse_pathspec()
417 remove match_pathspec() in favor of match_pathspec_depth()
418 tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
419 rename field "raw" to "_raw" in struct pathspec
420 parse_pathspec: make sure the prefix part is wildcard-free
421 parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
422 kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
423 pathspec: support :(literal) syntax for noglob pathspec
424 pathspec: make --literal-pathspecs disable pathspec magic
425 pathspec: support :(glob) syntax
426 parse_pathspec: accept :(icase)path syntax
427 smart http: use the same connectivity check on cloning
428 for-each-ref, quote: convert *_quote_print -> *_quote_buf
429 gc: reject if another gc is running, unless --force is given
430 push: respect --no-thin
431 pathspec: catch prepending :(prefix) on pathspec with short magic
432 add: lift the pathspec magic restriction on "add -p"
433 pack-objects: no crc check when the cached version is used
434 fetch-pack.c: show correct command name that fails
435 clone: tighten "local paths with colons" check a bit
436 Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
437 entry.c: convert checkout_entry to use strbuf
440 lookup_object: remove hashtable_index() and optimize hash_obj()
443 git-svn: fix signed commit parsing
444 config doc: user.signingkey is also used for signed commits
447 Doc: 'replace' merge and non-merge commits
448 doc: command line interface (cli) dot-repository dwimmery
449 config doc: update dot-repository notes
450 remote doc: document long forms of set-head options
451 remote set-head -h: add long options to synopsis
452 doc/cli: make "dot repository" an independent bullet point
455 Documentation/git-merge-file: document option "--diff3"
456 status: show commit sha1 in "You are currently cherry-picking" message
458 Ramkumar Ramachandra (3):
459 editor: use canonicalized absolute path
460 tar-tree: remove dependency on sq_quote_print()
461 quote: remove sq_quote_print()
463 Ramsay Allan Jones (9):
464 howto/setup-git-server-over-http: fix unescaped '^'s
465 howto/revert-a-faulty-merge: fix unescaped '^'s
466 config.c: mark file-local function static
467 refs.c: spell NULL pointer as NULL
468 wrapper.c: only define gitmkstemps if needed
469 gitweb test: fix highlight test hang on Linux Mint
470 format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0
471 sparse: suppress some "using sizeof on a function" warnings
472 http.c: Spell the null pointer as NULL
475 pull: use $curr_branch_short more
478 peel_onion(): add support for <rev>^{tag}
479 glossary: mention 'treeish' as an alternative to 'tree-ish'
480 glossary: define commit-ish (a.k.a. committish)
481 use 'tree-ish' instead of 'treeish'
482 use 'commit-ish' instead of 'committish'
483 glossary: more precise definition of tree-ish (a.k.a. treeish)
484 revisions.txt: fix and clarify <rev>^{<type>}
485 glossary: fix and clarify the definition of 'ref'
486 remote-bzr: reuse bzrlib transports when possible
489 bash prompt: test the prompt with newline in repository path
490 completion: improve untracked directory filtering for filename completion
491 bash prompt: don't use '+=' operator in show upstream code path
492 t3600: fix broken "choking git rm" test
494 Sebastian Schuberth (5):
495 Documentation: make AsciiDoc links always point to HTML files
496 MinGW: Fix stat definitions to work with MinGW runtime version 4.0
497 Windows: do not redefine _WIN32_WINNT
498 clone: add a period after "done" to end the sentence
499 path-utils test: rename mingw_path function to print_path
502 Document the HTTP transport protocols
505 rm: do not set a variable twice without intermediate reading.
506 Remove deprecated OPTION_BOOLEAN for parsing arguments
507 Replace deprecated OPT_BOOLEAN by OPT_BOOL
508 log, format-patch: parsing uses OPT__QUIET
509 checkout: remove superfluous local variable
510 branch, commit, name-rev: ease up boolean conditions
511 hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP
512 config parsing options: allow one flag multiple times
513 checkout-index: fix negations of even numbers of -n
514 revert: use the OPT_CMDMODE for parsing, reducing code
515 diff: remove ternary operator evaluating always to true
516 diff: fix a possible null pointer dereference
517 rm: remove unneeded null pointer check
518 create_delta_index: simplify condition always evaluating to true
519 mailmap: remove redundant check for freeing memory
520 repack: rewrite the shell script in C
521 repack: retain the return value of pack-objects
522 repack: improve warnings about failure of renaming and removing files
523 contrib: remove ciabot
524 checkout test: enable test with complex relative path
525 Reword repack documentation to no longer state it's a script
526 git-svn docs: Use tabs consistently within the ascii doc
529 mergetools/diffmerge: support DiffMerge as a git mergetool
530 mergetool--lib: Fix typo in the merge/difftool help
532 Steffen Prohaska (1):
533 git.txt: fix asciidoc syntax of --*-pathspecs
535 Stephen Haberman (1):
536 pull: allow pull to preserve merges when rebasing
539 git-credential-netrc: fix uninitialized warning
541 Thomas Ackermann (11):
542 Call it "Git User Manual" and remove reference to very old Git version
543 Use current "detached HEAD" message
544 Use current output for "git repack"
545 Use "git merge" instead of "git pull ."
546 Fix some typos and improve wording
547 Simplify "How to make a commit"
548 Improve section "Manipulating branches"
549 Improve section "Merging multiple trees"
550 Remove unnecessary historical note from "Object storage format"
551 Remove irrelevant reference from "Tying it all together"
555 read-cache: use fixed width integer types
558 urlmatch.c: recompute pointer after append_normalized_escapes
559 .mailmap: switch to Thomas Rast's personal address
560 Documentation: revamp gitk(1)
561 Revert "test-lib: support running tests under valgrind in parallel"
562 Revert "test-lib: allow prefixing a custom string before "ok N" etc."
565 gitweb: ensure OPML text fits inside its box
566 gitweb: vertically centre contents of page footer
567 gitweb: omit the repository owner when it is unset
568 gitweb: make search help link less ugly
570 Torsten Bögershausen (1):
571 Set core.precomposeunicode to true on e.g. HFS+
574 git-svn: fix termination issues for remote svn connections
576 brian m. carlson (3):
577 submodule: fix confusing variable name
578 submodule: don't print status output with ignore=all
579 CodingGuidelines: style for multi-line comments
582 git p4 test: sanitize P4CHARSET
584 Ævar Arnfjörð Bjarmason (1):
585 gitweb: Fix the author initials in blame for non-ASCII names
588 Version v1.8.4.2; changes since v1.8.4.1:
589 -----------------------------------------
592 commit: search author pattern against mailmap
594 Christian Couder (1):
595 sha1_file: move comment about return value where it belongs
598 rebase -i: fix cases ignoring core.commentchar
599 dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
600 t3404: make tests more self-contained
601 t3404: rebase -i: demonstrate short SHA-1 collision
602 t3200: fix failure on case-insensitive filesystems
605 has_sha1_file: re-check pack directory before giving up
606 upload-pack: send keepalive packets during pack computation
607 upload-pack: bump keepalive default to 5 seconds
608 clone: send diagnostic messages to stderr
609 clone: treat "checking connectivity" like other progress
610 clone: always set transport options
611 shortlog: ignore commits with missing authors
612 format-patch: print in-body "From" only when needed
615 t2024: Fix &&-chaining and a couple of typos
616 t3200: Minor fix when preparing for tracking failure
617 Refer to branch.<name>.remote/merge when documenting --track
618 t3200: Add test demonstrating minor regression in 41c21f2
621 add--interactive: fix external command invocation on Windows
624 merge-recursive: fix parsing of "diff-algorithm" option
627 dir.c: use the cache_* macro to access the current index
628 ls-files -k: a directory only can be killed if the index has a non-directory
629 t3010: update to demonstrate "ls-files -k" optimization pitfalls
630 rebase -i: fix short SHA-1 collision
631 cvsserver: pick up the right mode bits
632 Start preparing for 1.8.4.2
636 Matthijs Kooijman (1):
637 Add testcase for needless objects during a shallow fetch
639 Nguyễn Thái Ngọc Duy (7):
640 move setup_alternate_shallow and write_shallow_commits to shallow.c
641 shallow: only add shallow graft points to new shallow file
642 shallow: add setup_temporary_shallow()
643 upload-pack: delegate rev walking in shallow fetch to pack-objects
644 list-objects: reduce one argument in mark_edges_uninteresting
645 list-objects: mark more commits as edges in mark_edges_uninteresting
646 Make setup_git_env() resolve .git file when $GIT_DIR is not specified
649 git-merge: document the -S option
652 branch.c: Relax unnecessary requirement on upstream's remote ref name
655 rebase --preserve-merges: ignore "merge.log" config
656 clone --branch: refuse to clone if upstream repo is empty
659 t4254: modernize tests
661 Steffen Prohaska (1):
662 git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORY
665 test-lib: fix typo in comment
667 brian m. carlson (1):
668 http-backend: provide Allow header for 405
671 Version v1.8.4.1; changes since v1.8.4:
672 ---------------------------------------
675 Documentation/git-merge.txt: fix formatting of example block
678 git-remote-mediawiki: bugfix for pages w/ >500 revisions
681 git-completion.bash: use correct Bash/Zsh array length syntax
682 t9902-completion.sh: old Bash still does not support array+=('') notation
683 contrib/git-prompt.sh: handle missing 'printf -v' more gracefully
686 config: do not use C function names as struct members
687 mailmap: handle mailmap blobs without trailing newlines
690 avoid segfault on submodule.*.path set to an empty "true"
693 stream_to_pack: xread does not guarantee to read all requested bytes
699 t5802: add test for connect helper
700 fetch: rename file-scope global "transport" to "gtransport"
701 fetch: refactor code that prepares a transport
702 fetch: refactor code that fetches leftover tags
703 fetch: work around "transport-take-over" hack
704 Start preparing for 1.8.4.1
707 Git.pm: add new temp_is_locked function
708 git-svn: allow git-svn fetching to work using serf
709 Git.pm: revert _temp_cache use of temp_is_locked
712 die_with_status: use "printf '%s\n'", not "echo"
713 rebase: fix run_specific_rebase's use of "return" on FreeBSD
715 Nguyễn Thái Ngọc Duy (1):
716 fetch-pack: do not remove .git/shallow file when --depth is not specified
719 l10n: de.po: use "das Tag" instead of "der Tag"
721 Ramsay Allan Jones (1):
722 builtin/fetch.c: Fix a sparse warning
724 Sebastien Helleu (1):
725 l10n: fr.po: hotfix for commit 6b388fc
727 Steffen Prohaska (2):
728 xread, xwrite: limit size of IO to 8MB
729 Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"
732 t7406-submodule-update: add missing &&
735 log: use true parents for diff even when rewriting
736 log: use true parents for diff when walking reflogs
739 fix shell syntax error in template
741 brian m. carlson (1):
742 send-email: don't call methods on undefined values
745 Version v1.8.4; changes since v1.8.4-rc4:
746 -----------------------------------------
749 Typofix draft release notes to 1.8.4
753 Version v1.8.4-rc4; changes since v1.8.4-rc3:
754 ---------------------------------------------
757 Revert "git stash: avoid data loss when "git stash save" kills a directory"
758 Revert "Add new @ shortcut for HEAD"
762 Version v1.8.4-rc3; changes since v1.8.4-rc2:
763 ---------------------------------------------
766 parse-options: fix clang opterror() -Wunused-value warning
769 l10n: fr.po: 821/2112 messages translated
770 l10n: Add reference for french translation team
773 l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)
774 l10n: zh_CN.po: translate 5 messages (2135t0f0u)
777 .mailmap: update long-lost friends with multiple defunct addresses
781 git-remote-mediawiki: ignore generated git-mw
784 l10n: Update Swedish translation (2135t0f0u)
787 t/t7407: fix two typos in submodule tests
790 l10n: de.po: switch from pure German to German+English
791 l10n: de.po: translate 99 new messages
792 l10n: de.po: translate 5 messages
795 .mailmap: fixup entries
796 .mailmap: Combine more (name, email) to individual persons
799 l10n: vi.po(2135t): v1.8.4 round 2
801 Wieland Hoffmann (1):
802 l10n: de.po: Fix a typo
805 Version v1.8.4-rc2; changes since v1.8.4-rc1:
806 ---------------------------------------------
809 fix typo in documentation of git-svn
812 l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)
813 l10n: zh_CN.po: translate 99 messages (2133t0f0u)
816 log doc: the argument to --encoding is not optional
819 Revert "cat-file: split --batch input lines on whitespace"
820 t3900: test rejecting log message with NULs correctly
821 commit: typofix for xxFFF[EF] check
824 Ramsay Allan Jones (1):
825 cygwin: Remove the Win32 l/stat() implementation
828 t8001, t8002: fix "blame -L :literal" test on NetBSD
831 .mailmap: Multiple addresses of Michael S. Tsirkin
834 Documentation/rev-list-options: add missing word in --*-parents
839 brian m. carlson (1):
840 Add missing test file for UTF-16.
843 Version v1.8.4-rc1; changes since v1.8.4-rc0:
844 ---------------------------------------------
847 git-completion.bash: replace zsh notation that breaks bash 3.X
850 docs/git-tag: explain lightweight versus annotated tags
853 docs: fix 'report-status' protocol capability thinko
854 docs: note that receive-pack knows side-band-64k capability
855 document 'agent' protocol capability
856 document 'quiet' receive-pack capability
857 commit.h: drop redundant comment
858 commit: tweak empty cherry pick advice for sequencer
861 Documentation/git-clean: fix description for range
862 git-clean: implement partial matching for selection
865 builtin/rm.c: consolidate error reporting for removing submodules
869 Avoid using `echo -n` anywhere
871 Maurício C Antunes (1):
872 hg-to-git: --allow-empty-message in git commit
874 Michael Haggerty (1):
875 do_one_ref(): save and restore value of current_ref
878 contrib/subtree: Fix make install target
880 Nguyễn Thái Ngọc Duy (1):
881 document 'allow-tip-sha1-in-want' capability
889 Ramkumar Ramachandra (1):
890 config doc: quote paths, fixing tilde-interpretation
892 Ramsay Allan Jones (1):
893 commit-slab.h: Fix memory allocation and addressing
896 .mailmap: combine more (email, name) to individual persons
899 Rename advice.object_name_warning to objectNameWarning
902 Version v1.8.4-rc0; changes since v1.8.3.4:
903 -------------------------------------------
906 t0008: remove duplicated test fixture data
907 check-ignore: add -n / --non-matching option
908 check-ignore: move setup into cmd_check_ignore()
909 check-ignore: allow incremental streaming of queries via --stdin
910 Documentation: add caveats about I/O buffering for check-{attr,ignore}
911 t0008: use named pipe (FIFO) to test check-ignore streaming
914 t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
915 t7102 (reset): don't hardcode SHA-1 in expected outputs
916 t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
917 pretty: Add failing tests: --format output should honor logOutputEncoding
918 pretty: --format output should honor logOutputEncoding
919 t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1
920 t4205 (log-pretty-formats): revert back single quotes
921 t4205, t6006, t7102: make functions better readable
922 t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set
923 t4205 (log-pretty-formats): avoid using `sed`
926 rebase -i: handle fixup! fixup! in --autosquash
927 lib-rebase: style: use write_script, <<-\EOF
930 git add -e: Explicitly specify that patch should have no color
933 diff: add --ignore-blank-lines option
936 Do not ignore merge options in interactive rebase
939 git-remote-mediawiki: use Git.pm functions for credentials
940 git-remote-mediawiki: remove hardcoded version number in the test suite
941 git-remote-mediawiki: introduction of Git::Mediawiki.pm
942 wrap-for-bin: make bin-wrappers chainable
943 git-remote-mediawiki: add a git bin-wrapper for developement
944 git-remote-mediawiki: update tests to run with the new bin-wrapper
945 git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki
946 git-remote-mediawiki: add git-mw command
947 git-remote-mediawiki: add preview subcommand into git mw
950 Revert "compat/unsetenv.c: Fix a sparse warning"
954 Export rewrite_parents() for 'log -L'
957 builtin/checkout.c: don't leak memory in check_tracking_name
958 t/t9802: explicitly name the upstream branch to use as a base
959 remote.c: avoid O(m*n) behavior in match_push_refs
962 t4205: replace .\+ with ..* in sed commands
965 submodule update: allow custom command to update submodule working tree
967 Christian Couder (1):
968 Makefile: replace "echo 1>..." with "echo >..."
971 git-remote-mediawiki: display message when launched directly
972 git-remote-mediawiki: make a regexp clearer
973 git-remote-mediawiki: move "use warnings;" before any instruction
974 git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
975 git-remote-mediawiki: always end a subroutine with a return
976 git-remote-mediawiki: move a variable declaration at the top of the code
977 git-remote-mediawiki: change syntax of map calls
978 git-remote-mediawiki: rewrite unclear line of instructions
979 git-remote-mediawiki: remove useless regexp modifier (m)
980 git-remote-mediawiki: change the behaviour of a split
981 git-remote-mediawiki: change separator of some regexps
982 git-remote-mediawiki: change style in a regexp
983 git-remote-mediawiki: change style in a regexp
984 git-remote-mediawiki: add newline in the end of die() error messages
985 git-remote-mediawiki: change the name of a variable
986 git-remote-mediawiki: turn double-negated expressions into simple expressions
987 git-remote-mediawiki: remove unused variable $entry
988 git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
989 git-remote-mediawiki: assign a variable as undef and make proper indentation
990 git-remote-mediawiki: check return value of open
991 git-remote-mediawiki: remove import of unused open2
992 git-remote-mediawiki: put long code into a subroutine
993 git-remote-mediawiki: modify strings for a better coding-style
994 git-remote-mediawiki: brace file handles for print for more clarity
995 git-remote-mediawiki: replace "unless" statements with negated "if" statements
996 git-remote-mediawiki: don't use quotes for empty strings
997 git-remote-mediawiki: put non-trivial numeric values in constants.
998 git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
999 git-remote-mediawiki: clearly rewrite double dereference
1000 git-remote-mediawiki: add a .perlcriticrc file
1001 git-remote-mediawiki: add a perlcritic rule in Makefile
1002 git-remote-mediawiki: make error message more precise
1005 git_mkstemps: correctly test return value of open()
1007 Dirk Wallenstein (1):
1008 request-pull: improve error message for invalid revision args
1011 show-ref: make --head always show the HEAD ref
1013 Eduardo R. D'Avila (5):
1014 t9903: add tests for git-prompt pcmode
1015 git-prompt.sh: refactor colored prompt code
1016 t9903: remove redundant tests
1017 git-prompt.sh: do not print duplicate clean color code
1018 git-prompt.sh: add missing information in comments
1021 t4211: fix broken test when one -L range is subset of another
1022 range_set: fix coalescing bug when range is a subset of another
1023 builtin: add git-check-mailmap command
1024 t4203: test check-mailmap command invocation
1025 t4203: demonstrate loss of single-character name in mailmap entry
1026 t4203: demonstrate loss of uppercase characters in canonical email
1027 mailmap: debug: fix out-of-order fprintf() arguments
1028 mailmap: debug: fix malformed fprintf() format conversion specification
1029 mailmap: debug: eliminate -Wformat field precision type warning
1030 mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification
1031 git-log.txt: fix typesetting of example "git-log -L" invocation
1032 line-range: fix "blame -L X,-N" regression
1033 t8001/t8002 (blame): modernize style
1034 t8001/t8002 (blame): add blame -L tests
1035 t8001/t8002 (blame): add blame -L :funcname tests
1036 blame-options.txt: place each -L option variation on its own line
1037 blame-options.txt: explain that -L <start> and <end> are optional
1038 contrib: add git-contacts helper
1039 contrib: contacts: add ability to parse from committish
1040 contrib: contacts: interpret committish akin to format-patch
1041 contrib: contacts: add mailmap support
1042 contrib: contacts: add documentation
1043 range-set: fix sort_and_merge_range_set() corner case bug
1044 t4211: demonstrate empty -L range crash
1045 t4211: demonstrate crash when first -L encountered is empty range
1046 range-set: satisfy non-empty ranges invariant
1047 line-log: fix "log -LN" crash when N is last line of file
1049 Felipe Contreras (108):
1050 transport-helper: report errors properly
1051 transport-helper: improve push messages
1052 transport-helper: clarify *:* refspec
1053 transport-helper: update refspec documentation
1054 transport-helper: clarify pushing without refspecs
1055 transport-helper: warn when refspec is not used
1056 transport-helper: trivial code shuffle
1057 transport-helper: update remote helper namespace
1058 completion: add file completion tests
1059 completion: document tilde expansion failure in tests
1060 completion; remove unuseful comments
1061 completion: use __gitcompadd for __gitcomp_file
1062 completion: refactor diff_index wrappers
1063 completion: refactor __git_complete_index_file()
1064 completion: add hack to enable file mode in bash < 4
1065 completion: add space after completed filename
1066 completion: remove __git_index_file_list_filter()
1067 fast-export: do not parse non-commit objects while reading marks file
1068 fast-export: don't parse commits while reading marks file
1069 fast-{import,export}: use get_sha1_hex() to read from marks file
1070 tests: at-combinations: simplify setup
1071 tests: at-combinations: check ref names directly
1072 tests: at-combinations: improve nonsense()
1073 sha1_name: remove no-op
1074 sha1_name: remove unnecessary braces
1075 completion: cleanup zsh wrapper
1076 completion: synchronize zsh wrapper
1077 sha1_name: reorganize get_sha1_basic()
1078 sha1_name: refactor reinterpret()
1079 Add new @ shortcut for HEAD
1080 sha1_name: compare variable with constant, not constant with variable
1081 test: remote-helper: add missing and
1082 transport-helper: fix remote helper namespace regression
1083 transport-helper: barf when user tries old:new
1084 transport-helper: check if the dry-run is supported
1085 remote-helpers: tests: use python directly
1086 remote-hg: tests: fix hg merge
1087 build: trivial simplification
1088 build: cleanup using $^
1089 build: cleanup using $<
1090 build: add NO_INSTALL variable
1091 build: do not install git-remote-testpy
1092 remote-bzr: recover from failed clones
1093 remote-bzr: fix for files with spaces
1094 remote-bzr: simplify get_remote_branch()
1095 remote-bzr: delay cloning/pulling
1096 remote-bzr: change global repo
1097 remote-bzr: trivial cleanups
1098 remote-bzr: reorganize the way 'wanted' works
1099 remote-bzr: add fallback check for a partial clone
1100 remote-hg: test: be a little more quiet
1101 remote-hg: trivial reorganization
1102 remote-helpers: test: cleanup white-spaces
1103 remote-helpers: test: cleanup style
1104 remote-helpers: tests: general improvements
1105 remote-helpers: test: simplify remote URLs
1106 remote-hg: test: simplify previous branch checkout
1107 remote-hg: load all extensions
1108 remote-hg: use a shared repository store
1109 remote-hg: shuffle some code
1110 remote-hg: improve node traversing
1111 remote-hg: add version checks to the marks
1112 remote-hg: switch from revisions to SHA-1 noteids
1113 remote-hg: upgrade version 1 marks
1114 remote-hg: ensure remote rebasing works
1115 remote-hg: trivial cleanups
1116 remote-hg: improve progress calculation
1117 remote-hg: always point HEAD to master
1118 remote-hg: add tests for 'master' bookmark
1119 remote-bzr: simplify test checks
1120 remote-hg: add check_bookmark() test helper
1121 remote-hg: update bookmarks when using a remote
1122 remote-hg: add remote tests
1123 remote-hg: add test to push new bookmark
1124 remote-hg: add test for diverged push
1125 remote-hg: add test for bookmark diverge
1126 remote-hg: add test for new bookmark special
1127 remote-hg: add test for big push
1128 remote-hg: add test for failed double push
1129 remote-hg: reorganize bookmark handling
1130 remote-hg: force remote bookmark push selectively
1131 remote-hg: only update necessary revisions
1132 remote-hg: implement custom push()
1133 remote-hg: implement custom checkheads()
1134 remote-hg: pass around revision refs
1135 remote-hg: check diverged bookmarks
1136 remote-hg: simplify branch_tip()
1137 remote-hg: improve branch listing
1138 remote-hg: use remote 'default' not local one
1139 remote-hg: improve lightweight tag author
1140 remote-hg: remove files before modifications
1141 remote-hg: add setup_big_push() helper
1142 remote-hg: add check_push() helper
1143 remote-helpers: improve marks usage
1144 remote-hg: trivial cleanup
1145 remote-hg: check if a fetch is needed
1146 remote-hg: add support for --dry-run
1147 remote-hg: add support for --force
1148 remote: trivial style cleanup
1149 test: trivial cleanups
1150 test: rebase: fix --interactive test
1151 send-email: remove warning about unset chainreplyto
1152 completion: zsh: improve bash script loading
1153 completion: avoid ls-remote in certain scenarios
1154 test: fix post rewrite hook report
1155 build: generate and clean test scripts
1156 build: do not install git-remote-testgit
1157 Makefile: use $^ to avoid listing prerequisites on the command line
1159 Fredrik Gustafsson (2):
1160 git-submodule.sh: remove duplicate call to set_rev_name
1161 Add --depth to submodule update/add
1164 French translation: copy -> copie.
1167 git-gui: allow "\ No newline at end of file" for linewise staging
1168 config: factor out config file stack management
1169 config: drop cf validity check in get_next_char()
1170 config: make parsing stack struct independent from actual data source
1171 teach config --blob option to parse config from database
1172 do not die when error in config parsing of buf occurs
1175 transport-helper: mention helper name when it dies
1176 commit: allow associating auxiliary info on-demand
1177 lookup_object: prioritize recently found objects
1178 t5510: start tracking-ref tests from a known state
1179 refactor "ref->merge" flag
1180 fetch: opportunistically update tracking refs
1181 t0005: test git exit code from signal death
1182 contrib: drop blameview/ directory
1183 t5303: drop "count=1" from corruption dd
1184 unpack_entry: do not die when we fail to apply a delta
1185 get_packed_ref_cache: reload packed-refs file when it changes
1186 for_each_ref: load all loose refs before packed refs
1187 transport-helper: be quiet on read errors from helpers
1188 fetch-pack: avoid quadratic list insertion in mark_complete
1189 commit.c: make compare_commits_by_commit_date global
1190 fetch-pack: avoid quadratic behavior in rev_list_push
1191 pretty.c: drop const-ness from pretty_print_context
1192 teach format-patch to place other authors into in-body "From"
1193 zero-initialize object_info structs
1194 teach sha1_object_info_extended a "disk_size" query
1195 clone: drop connectivity check for local clones
1196 add missing "format" function attributes
1197 use "sentinel" function attribute for variadic lists
1198 wt-status: use "format" function attribute for status_printf
1199 t1006: modernize output comparisons
1200 cat-file: teach --batch to stream blob objects
1201 cat-file: refactor --batch option parsing
1202 cat-file: add --batch-check=<format>
1203 cat-file: add %(objectsize:disk) format atom
1204 cat-file: split --batch input lines on whitespace
1205 pack-revindex: use unsigned to store number of objects
1206 pack-revindex: radix-sort the revindex
1207 t0008: avoid SIGPIPE race condition on fifo
1208 cat-file: disable object/refname ambiguity check for batch mode
1209 sha1_object_info_extended: rename "status" to "type"
1210 sha1_loose_object_info: make type lookup optional
1211 packed_object_info: hoist delta type resolution to helper
1212 packed_object_info: make type lookup optional
1213 sha1_object_info_extended: make type calculation optional
1214 sha1_object_info_extended: pass object_info to helpers
1217 test: add test cases for relative_path
1218 path.c: refactor relative_path(), not only strip prefix
1219 quote.c: substitute path_relative with relative_path
1220 quote_path_relative(): remove redundant parameter
1221 write_name{_quoted_relative,}(): remove redundant parameters
1222 git-clean: refactor git-clean into two phases
1223 git-clean: add support for -i/--interactive
1224 git-clean: show items of del_list in columns
1225 git-clean: add colors to interactive git-clean
1226 git-clean: use a git-add-interactive compatible UI
1227 git-clean: add filter by pattern interactive action
1228 git-clean: add select by numbers interactive action
1229 git-clean: add ask each interactive action
1230 git-clean: add documentation for interactive git-clean
1231 test: add t7301 for git-clean--interactive
1232 test: run testcases with POSIX absolute paths on Windows
1235 finish_copy_notes_for_rewrite(): Let caller provide commit message
1236 Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
1237 Move create_notes_commit() from notes-merge.c into notes-utils.c
1239 Johannes Schindelin (2):
1240 Define NO_GETTEXT for Git for Windows
1241 Windows resource: handle dashes in the Git version gracefully
1244 git-remote-testgit: avoid process substitution
1245 git-remote-testgit: further remove some bashisms
1246 t0005: skip signal death exit code test on Windows
1247 rebase topology tests: fix commit names on case-insensitive file systems
1250 t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
1251 test output: respect $TEST_OUTPUT_DIRECTORY
1252 t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
1253 fetch: don't try to update unfetched tracking refs
1254 git-gui: fix file name handling with non-empty prefix
1255 add--interactive: respect diff.algorithm
1256 Documentation/Makefile: fix spaces around assignments
1257 Documentation/Makefile: move infodir to be with other '*dir's
1258 mergetool--lib: refactor {diff,merge}_cmd logic
1259 t7401: make indentation consistent
1260 t7403: modernize style
1261 t7403: add missing && chaining
1262 submodule: show full path in error message
1263 rev-parse: add --prefix option
1264 submodule: drop the top-level requirement
1265 completion: handle unstuck form of base git options
1266 completion: learn about --man-path
1267 git-config(1): clarify precedence of multiple values
1268 push: avoid suggesting "merging" remote changes
1269 pull: change the description to "integrate" changes
1271 Jonathan Nieder (1):
1272 mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
1275 Documentation: remove --prune from pack-refs examples
1276 Documentation: fix git-prune example usage
1278 Jorge Juan Garcia Garcia (4):
1279 status: introduce status.short to enable --short by default
1280 status: introduce status.branch to enable --branch by default
1281 status: introduce status.short to enable --short by default
1282 status: introduce status.branch to enable --branch by default
1284 Junio C Hamano (56):
1285 commit-slab: avoid large realloc
1286 date.c: add parse_expiry_date()
1287 line-log: fix documentation formatting
1288 t5801: "VAR=VAL shell_func args" is forbidden
1289 prune: introduce OPT_EXPIRY_DATE() and use it
1290 git-remote-testgit: build it to run under $SHELL_PATH
1291 t6111: allow checking the parents as well
1292 t6012: update test for tweaked full-history traversal
1294 Update draft release notes to 1.8.4
1295 Update draft release notes to 1.8.4
1296 Update draft release notes to 1.8.4
1297 commit-slab: introduce a macro to define a slab for new type
1298 test: test_must_be_empty helper
1299 Update draft release notes
1300 toposort: rename "lifo" field
1301 prio-queue: priority queue of pointers to structs
1302 sort-in-topological-order: use prio-queue
1303 log: --author-date-order
1304 Update draft release notes to 1.8.4
1305 t7512: test "detached from" as well
1306 Update draft release notes to 1.8.4
1307 t/lib-t6000: style fixes
1308 topology tests: teach a helper to take abbreviated timestamps
1309 t6003: add --date-order test
1310 topology tests: teach a helper to set author dates as well
1311 t6003: add --author-date-order test
1312 add -i: add extra options at the right place in "diff" command line
1313 Update draft release notes to 1.8.4
1314 Revert "Merge branch 'jg/status-config'"
1315 status/commit: make sure --porcelain is not affected by user-facing config
1316 Update draft release notes to 1.8.4
1317 Update draft release notes to 1.8.4
1318 Update draft release notes to 1.8.4
1319 Update draft release notes to 1.8.4
1320 Update draft release notes to 1.8.4
1321 treat_directory(): do not declare submodules to be untracked
1322 name-ref: factor out name shortening logic from name_ref()
1323 name-rev: allow converting the exact object name at the tip of a ref
1324 describe: use argv-array
1325 remote-http: use argv-array
1326 Update draft release notes to 1.8.4
1327 Update draft release notes for 1.8.4
1328 mailmap: do not lose single-letter names
1329 mailmap: do not downcase mailmap entries
1330 mailmap: style fixes
1331 Revert "git-clone.txt: remove the restriction on pushing from a shallow clone"
1332 Update draft release notes to 1.8.4
1333 Update draft release notes to 1.8.4
1334 name-rev: differentiate between tags and commits they point at
1335 describe: fix --contains when a tag is given as input
1336 t2202: make sure "git add" (no args) stays a no-op
1337 Update draft release notes to 1.8.4
1338 t7600: fix typo in test title
1339 t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant)
1343 decorate.c: compact table when growing
1344 t6019: test file dropped in -s ours merge
1345 t6111: new TREESAME test set
1346 t6111: add parents to tests
1347 rev-list-options.txt: correct TREESAME for P
1348 Documentation: avoid "uninteresting"
1349 revision.c: Make --full-history consider more merges
1350 simplify-merges: never remove all TREESAME parents
1351 simplify-merges: drop merge from irrelevant side branch
1352 revision.c: add BOTTOM flag for commits
1353 revision.c: discount side branches when computing TREESAME
1354 revision.c: don't show all merges for --parents
1355 revision.c: make default history consider bottom commits
1356 am: replace uses of --resolved with --continue
1359 git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
1362 test-lib.sh - cygwin does not have usable FIFOs
1363 test-lib.sh - define and use GREP_STRIPS_CR
1364 Cygwin 1.7 needs compat/regex
1365 Cygwin 1.7 has thread-safe pread
1366 Cygwin 1.7 supports mmap
1367 cygwin: stop forcing core.filemode=false
1369 Martin von Zweigbergk (7):
1370 add simple tests of consistency across rebase types
1371 add tests for rebasing with patch-equivalence present
1372 add tests for rebasing of empty commits
1373 add tests for rebasing root
1374 add tests for rebasing merged history
1375 t3406: modernize style
1376 tests: move test for rebase messages from t3400 to t3406
1378 Mathieu Lienard--Mayor (2):
1379 rm: better error message on failure for multiple files
1380 rm: introduce advice.rmHints to shorten messages
1383 config: refactor management of color.ui's default value
1384 git-remote-mediawiki: better error message when HTTP(S) access fails
1385 make color.ui default to 'auto'
1386 git-remote-mediawiki: un-brace file handles in binmode calls
1387 t4000-diff-format.sh: modernize style
1388 diff: allow --no-patch as synonym for -s
1389 diff: allow --patch & cie to override -s/--no-patch
1390 Documentation/git-show.txt: include common diff options, like git-log.txt
1391 Documentation: move description of -s, --no-patch to diff-options.txt
1392 Documentation/git-log.txt: capitalize section names
1394 Matthijs Kooijman (1):
1395 upload-pack: remove a piece of dead code
1397 Michael Haggerty (75):
1398 git-gc.txt, git-reflog.txt: document new expiry options
1399 api-parse-options.txt: document "no-" for non-boolean options
1400 refs: document flags constants REF_*
1401 refs: document the fields of struct ref_value
1402 refs: document do_for_each_ref() and do_one_ref()
1403 refs: document how current_ref is used
1404 refs: define constant PEELED_LINE_LENGTH
1405 do_for_each_ref_in_dirs(): remove dead code
1406 get_packed_ref(): return a ref_entry
1407 peel_ref(): use function get_packed_ref()
1408 repack_without_ref(): use function get_packed_ref()
1409 refs: extract a function ref_resolves_to_object()
1410 refs: extract function peel_object()
1411 peel_object(): give more specific information in return value
1412 peel_ref(): fix return value for non-peelable, not-current reference
1413 refs: extract a function peel_entry()
1414 refs: change the internal reference-iteration API
1415 t3210: test for spurious error messages for dangling packed refs
1416 repack_without_ref(): silence errors for dangling packed refs
1417 search_ref_dir(): return an index rather than a pointer
1418 refs: change how packed refs are deleted
1419 t3211: demonstrate loss of peeled refs if a packed ref is deleted
1420 repack_without_ref(): write peeled refs in the rewritten file
1421 refs: extract a function write_packed_entry()
1422 pack-refs: rename handle_one_ref() to pack_one_ref()
1423 pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
1424 pack_one_ref(): rename "path" parameter to "refname"
1425 refs: use same lock_file object for both ref-packing functions
1426 pack_refs(): change to use do_for_each_entry()
1427 refs: inline function do_not_prune()
1428 pack_one_ref(): use function peel_entry()
1429 pack_one_ref(): use write_packed_entry() to do the writing
1430 pack_one_ref(): do some cheap tests before a more expensive one
1431 refs: change do_for_each_*() functions to take ref_cache arguments
1432 refs: handle the main ref_cache specially
1433 describe: make own copy of refname
1434 fetch: make own copies of refnames
1435 add_rev_cmdline(): make a copy of the name argument
1436 builtin_diff_tree(): make it obvious that function wants two entries
1437 cmd_diff(): use an object_array for holding trees
1438 cmd_diff(): rename local variable "list" -> "entry"
1439 cmd_diff(): make it obvious which cases are exclusive of each other
1440 revision: split some overly-long lines
1441 object_array: add function object_array_filter()
1442 revision: use object_array_filter() in implementation of gc_boundary()
1443 object_array_remove_duplicates(): rewrite to reduce copying
1444 fsck: don't put a void*-shaped peg in a char*-shaped hole
1445 find_first_merges(): initialize merges variable using initializer
1446 find_first_merges(): remove unnecessary code
1447 object_array_entry: fix memory handling of the name field
1448 do_fetch(): reduce scope of peer_item
1449 do_fetch(): clean up existing_refs before exiting
1450 add_existing(): do not retain a reference to sha1
1451 show_head_ref(): do not shadow name of argument
1452 show_head_ref(): rename first parameter to "refname"
1453 string_list_add_one_ref(): rename first parameter to "refname"
1454 string_list_add_refs_by_glob(): add a comment about memory management
1455 exclude_existing(): set existing_refs.strdup_strings
1456 register_ref(): make a copy of the bad reference SHA-1
1457 refs: document the lifetime of the args passed to each_ref_fn
1458 resolve_ref_unsafe(): extract function handle_missing_loose_ref()
1459 resolve_ref_unsafe(): handle the case of an SHA-1 within loop
1460 resolve_ref_unsafe(): close race condition reading loose refs
1461 repack_without_ref(): split list curation and entry writing
1462 pack_refs(): split creation of packed refs and entry writing
1463 refs: wrap the packed refs cache in a level of indirection
1464 refs: implement simple transactions for the packed-refs file
1465 refs: manage lifetime of packed refs cache via reference counting
1466 do_for_each_entry(): increment the packed refs cache refcount
1467 packed_ref_cache: increment refcount when locked
1468 Extract a struct stat_data from cache_entry
1469 add a stat_validity struct
1470 refs: do not invalidate the packed-refs cache unnecessarily
1471 git-multimail: an improved replacement for post-receive-email
1472 post-receive-email: deprecate script in favor of git-multimail
1474 Michael Schubert (1):
1475 Change "remote tracking" to "remote-tracking"
1478 describe: Add --first-parent option
1481 merge: handle --ff/--no-ff/--ff-only as a tri-state option
1484 name-rev: allow to specify a subpath for --refs option
1486 Nguyễn Thái Ngọc Duy (10):
1487 clone: allow cloning local paths with colons in them
1488 index-pack: remove dead code (it should never happen)
1489 clone: open a shortcut for connectivity check
1490 prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
1491 get_sha1: warn about full or short object names that look like refs
1492 Makefile: promote wildmatch to be the default fnmatch implementation
1493 core: use env variable instead of config var to turn on logging pack access
1494 git.txt: document GIT_TRACE_PACKET
1495 Convert "struct cache_entry *" to "const ..." wherever possible
1496 git-clone.txt: remove the restriction on pushing from a shallow clone
1499 typofix: release notes
1500 typofix: documentation
1501 typofix: in-code comments
1504 git-gui: fix the mergetool launcher for the Beyond Compare tool.
1505 git-gui: change dialog button positions for Windows to suit platform.
1506 Provide a Windows version resource for the git executables.
1507 Ensure the resource file is rebuilt when the version changes.
1508 Set the default help format to html for msys builds.
1509 git-gui: avoid an error message when removing the last remote
1513 commit: reject non-characters
1516 git stash: avoid data loss when "git stash save" kills a directory
1518 Pierre le Riche (1):
1519 msysgit: Add the --large-address-aware linker directive to the makefile.
1522 wt-status: give better advice when cherry-pick is in progress
1524 Ramkumar Ramachandra (54):
1525 tests: at-combinations: increase coverage
1526 tests: at-combinations: @{N} versus HEAD@{N}
1527 sha1_name: don't waste cycles in the @-parsing loop
1528 sha1_name: check @{-N} errors sooner
1529 am: tighten a conditional that checks for $dotest
1530 rebase -i: don't error out if $state_dir already exists
1531 rebase: prepare to do generic housekeeping
1532 am: return control to caller, for housekeeping
1533 rebase -i: return control to caller, for housekeeping
1534 rebase --merge: return control to caller, for housekeeping
1535 prompt: introduce GIT_PS1_STATESEPARATOR
1536 prompt: factor out gitstring coloring logic
1537 prompt: colorize ZSH prompt
1538 rebase: implement --[no-]autostash and rebase.autostash
1539 contrib: remove continuous/ and patches/
1540 completion: difftool takes both revs and files
1541 completion: show can take both revlist and paths
1542 rebase: guard against missing files in read_basic_state()
1543 rebase: finish_rebase() in fast-forward rebase
1544 rebase: finish_rebase() in noop rebase
1545 prompt: squelch error output from cat
1546 t/rebase: add failing tests for a peculiar revision
1547 sh-setup: add new peel_committish() helper
1548 rebase: use peel_committish() where appropriate
1549 am: handle stray $dotest directory
1550 t/am: use test_path_is_missing() where appropriate
1551 stash doc: add a warning about using create
1552 stash doc: document short form -p in synopsis
1553 stash: simplify option parser for create
1554 wt-status: remove unused field in grab_1st_switch_cbdata
1555 t/t2021-checkout-last: "checkout -" should work after a rebase finishes
1556 status: do not depend on rebase reflog messages
1557 checkout: respect GIT_REFLOG_ACTION
1558 stash: introduce 'git stash store'
1559 rebase: use 'git stash store' to simplify logic
1560 sequencer: write useful reflog message for fast-forward
1561 t/t5528-push-default: remove redundant test_config lines
1562 t/t5505-remote: modernize style
1563 t/t5505-remote: test push-refspec in branches-file
1564 t/t5505-remote: use test_path_is_missing
1565 remote: remove dead code in read_branches_file()
1566 t/t5505-remote: test url-with-# in branches-file
1567 ls-remote doc: fix example invocation on git.git
1568 ls-remote doc: rewrite <repository> paragraph
1569 ls-remote doc: don't encourage use of branches-file
1570 t/t5505-remote: test multiple push/pull in remotes-file
1571 config doc: rewrite push.default section
1572 rebase: use a better reflog message
1573 rebase -i: use a better reflog message
1574 push: change `simple` to accommodate triangular workflows
1575 t/t5528-push-default: generalize test_push_*
1576 t/t5528-push-default: test pushdefault workflows
1577 commit: make it work with status.short
1578 send-email: be explicit with SSL certificate verification
1580 Ramsay Allan Jones (14):
1581 compat/regex/regexec.c: Fix some sparse warnings
1582 compat/fnmatch/fnmatch.c: Fix a sparse error
1583 compat/nedmalloc: Fix some sparse warnings
1584 compat/nedmalloc: Fix compiler warnings on linux
1585 compat/unsetenv.c: Fix a sparse warning
1586 compat/win32/pthread.c: Fix a sparse warning
1587 compat/poll/poll.c: Fix a sparse warning
1588 compat/win32mmap.c: Fix some sparse warnings
1589 compat/mingw.c: Fix some sparse warnings
1590 sparse: Fix mingw_main() argument number/type errors
1591 cygwin: Remove the CYGWIN_V15_WIN32API build variable
1592 path: Fix a sparse warning
1593 Fix some sparse warnings
1594 Add the LAST_ARG_MUST_BE_NULL macro
1597 cache: mark cache_entry pointers const
1598 read-cache: mark cache_entry pointers const
1599 unpack-trees: factor out dup_entry
1600 unpack-trees: create working copy of merge entry in merged_entry
1601 diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
1602 diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
1603 unpack-trees: free cache_entry array members for merges
1604 match-trees: factor out fill_tree_desc_strict
1605 unpack-trees: don't shift conflicts left and right
1606 diffcore-pickaxe: simplify has_changes and contains
1607 .mailmap: René Scharfe has a new email address
1609 Richard Hartmann (3):
1610 templates: Use heredoc in pre-commit hook
1611 templates: Reformat pre-commit hook's message
1612 templates: spell ASCII in uppercase in pre-commit hook
1615 bash prompt: fix redirection coding style in tests
1616 bash prompt: use 'write_script' helper in interactive rebase test
1617 completion, bash prompt: move __gitdir() tests to completion test suite
1618 bash prompt: add a test for symbolic link symbolic refs
1619 bash prompt: print unique detached HEAD abbreviated object name
1620 bash prompt: return early from __git_ps1() when not in a git repository
1621 bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()
1622 bash prompt: use bash builtins to find out rebase state
1623 bash prompt: use bash builtins to find out current branch
1624 bash prompt: combine 'git rev-parse' executions in the main code path
1625 bash prompt: combine 'git rev-parse' for detached head
1626 bash prompt: use bash builtins to check for unborn branch for dirty state
1627 bash prompt: use bash builtins to check stash state
1628 bash prompt: avoid command substitution when checking for untracked files
1629 bash prompt: avoid command substitution when finalizing gitstring
1630 bash prompt: mention that PROMPT_COMMAND mode is faster
1632 Sebastian Schuberth (1):
1633 Makefile: Do not use OLD_ICONV on MINGW anymore
1636 Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist
1639 .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"
1640 .mailmap: Map email addresses to names
1641 .mailmap: Combine more (email, name) to individual persons
1642 daemon.c:handle: Remove unneeded check for null pointer.
1643 commit: Fix a memory leak in determine_author_info
1644 diff.c: Do not initialize a variable, which gets reassigned anyway.
1645 parse_object_buffer: correct freeing the buffer
1646 .mailmap: combine more (email, name) to individual persons
1647 traverse_trees(): clarify return value of the callback
1648 open_istream: remove unneeded check for null pointer
1651 git-gui: bring wish process to front on Mac
1653 Thomas Gummerer (1):
1654 perf-lib: fix start/stop of perf tests
1657 Implement line-history search (git log -L)
1658 log -L: :pattern:file syntax to find by funcname
1659 Speed up log -L... -M
1660 log -L: check range set invariants when we look it up
1661 log -L: fix overlapping input ranges
1662 t4211: pass -M to 'git log -M -L...' test
1663 log -L: test merge of parallel modify/rename
1664 log -L: store the path instead of a diff_filespec
1665 log -L: improve comments in process_all_files()
1666 git-log(1): remove --full-line-diff description
1667 fetch/pull doc: untangle meaning of bare <ref>
1668 sha1_file: silence sha1_loose_object_info
1669 test-lib: enable MALLOC_* for the actual tests
1670 test-lib: refactor $GIT_SKIP_TESTS matching
1671 test-lib: rearrange start/end of test_expect_* and test_skip
1672 test-lib: self-test that --verbose works
1673 test-lib: verbose mode for only tests matching a pattern
1674 test-lib: valgrind for only tests matching a pattern
1675 test-lib: allow prefixing a custom string before "ok N" etc.
1676 test-lib: support running tests under valgrind in parallel
1677 run-command: dup_devnull(): guard against syscalls failing
1678 daemon/shell: refactor redirection of 0/1/2 from /dev/null
1679 git: ensure 0/1/2 are open in main()
1680 apply, entry: speak of submodules instead of subprojects
1681 show-branch: fix description of --date-order
1684 gitweb: allow extra breadcrumbs to prefix the trail
1686 Torsten Bögershausen (1):
1687 t0000: do not use export X=Y
1690 doc/clone: Remove the '--bare -l -s' example
1691 doc/clone: Pick more compelling paths for the --reference example
1692 Documentation: Update the NFS remote examples to use the staging repo
1693 Documentation: Update 'linux-2.6.git' -> 'linux.git'
1696 credential-osxkeychain: support more protocols
1698 brian m. carlson (3):
1699 send-email: provide port separately from hostname
1700 commit: reject invalid UTF-8 codepoints
1701 commit: reject overlong UTF-8 sequences
1704 Version v1.8.3.4; changes since v1.8.3.3:
1705 -----------------------------------------
1707 Dennis Kaarsemaker (2):
1708 tests: allow sha1's as part of the path
1709 GIT-VERSION-GEN: support non-standard $GIT_DIR path
1711 Fraser Tweedale (2):
1712 documentation: add git:// transport security notice
1713 diff-options: document default similarity index
1716 t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
1717 t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
1718 t/lib-httpd/apache.conf: load compat access module in apache 2.4
1719 t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
1720 lib-httpd/apache.conf: check version only after mod_version loads
1723 test-chmtime: Fix exit code on Windows
1724 t3010: modernize style
1725 tests: introduce test_ln_s_add
1726 tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
1727 t0000: use test_ln_s_add to remove SYMLINKS prerequisite
1728 t3030: use test_ln_s_add to remove SYMLINKS prerequisite
1729 t3100: use test_ln_s_add to remove SYMLINKS prerequisite
1730 t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
1731 t6035: use test_ln_s_add to remove SYMLINKS prerequisite
1732 t4011: remove SYMLINKS prerequisite
1735 fetch-options.txt: prevent a wildcard refspec from getting misformatted
1736 diff: demote core.safecrlf=true to core.safecrlf=warn
1737 t1512: correct leftover constants from earlier edition
1738 get_short_sha1(): correctly disambiguate type-limited abbreviation
1739 Start preparing for 1.8.3.4
1740 Update draft release notes to 1.8.3.4
1744 Documentation: Move "git diff <blob> <blob>"
1747 Documentation/git-push.txt: explain better cases where --force is dangerous
1748 Documentation/git-merge.txt: weaken warning about uncommited changes
1750 Michael Haggerty (1):
1751 lockfile: fix buffer overflow in path handling
1754 config: Add description of --local option
1757 update URL to the marc.info mail archive
1760 fix "builtin-*" references to be "builtin/*"
1762 Ramkumar Ramachandra (2):
1763 column doc: rewrite documentation for column.ui
1764 name-rev doc: rewrite --stdin paragraph
1767 t5000: integrate export-subst tests into regular tests
1768 t5000, t5003: create directories for extracted files lazily
1769 t5000: factor out check_tar
1770 t5000: use check_tar for prefix test
1771 t5000: simplify tar-tree tests
1772 t5000: test long filenames
1773 read-cache: add simple performance test
1774 read-cache: free cache in discard_index
1775 use logical OR (||) instead of binary OR (|) in logical context
1778 archive-zip:write_zip_entry: Remove second reset of size variable to zero.
1779 Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-sh
1780 http-push.c::add_send_request(): do not initialize transfer_request
1781 apply.c::find_name_traditional(): do not initialize len to the line's length
1784 coverage: split build target into compile and test
1785 coverage: do not delete .gcno files before building
1786 coverage: set DEFAULT_TEST_TARGET to avoid using prove
1787 coverage: build coverage-untested-functions by default
1788 Test 'commit --only' after 'checkout --orphan'
1789 t9902: fix 'test A == B' to use = operator
1790 test-lint: detect 'export FOO=bar'
1793 bisect: Fix log output for multi-parent skip ranges
1796 random typofixes (committed missing a 't', successful missing an 's')
1799 t9801: git-p4: check ignore files with client spec
1802 user-manual: Update download size for Git and the kernel
1804 Yaakov Selkowitz (1):
1805 web--browse: support /usr/bin/cygstart on Cygwin
1808 Version v1.8.3.3; changes since v1.8.3.2:
1809 -----------------------------------------
1812 lib-rebase: document exec_ in FAKE_LINES
1813 t7500: fix flipped actual/expect
1816 wildmatch: properly fold case everywhere
1819 http.c: don't rewrite the user:passwd string multiple times
1821 Charles McGarvey (1):
1822 gitweb: fix problem causing erroneous project list
1825 git.txt: remove stale comment regarding GIT_WORK_TREE
1827 Clemens Buchacher (1):
1828 fix segfault with git log -c --follow
1831 Makefile: fix default regex settings on Darwin
1832 Makefile: add support for Apple CommonCrypto facility
1833 cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
1834 imap-send: eliminate HMAC deprecation warnings on Mac OS X
1836 Dmitry Marakasov (1):
1837 contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
1839 Felipe Contreras (4):
1840 read-cache: fix wrong 'the_index' usage
1841 read-cache: trivial style cleanups
1842 sequencer: remove useless indentation
1843 sequencer: avoid leaking message buffer when refusing to create an empty commit
1845 Filipe Cabecinhas (1):
1846 compate/clipped-write.c: large write(2) fails on Mac OS X/XNU
1848 Fredrik Gustafsson (1):
1849 handle multibyte characters in name
1852 pull: update unborn branch tip after index
1855 git-config: update doc for --get with multiple values
1858 deprecate core.statinfo at Git 2.0 boundary
1859 t5551: do not use unportable sed '\+'
1860 Documentation/diff-index: mention two modes of operation
1861 Start preparing for 1.8.3.3
1862 Update draft release notes to 1.8.3.3
1865 Michael S. Tsirkin (9):
1866 t/send-email.sh: add test for suppress-cc=self
1867 send-email: fix suppress-cc=self on cccmd
1868 t/send-email: test suppress-cc=self on cccmd
1869 send-email: make --suppress-cc=self sanitize input
1870 t/send-email: add test with quoted sender
1871 t/send-email: test suppress-cc=self with non-ascii
1872 test-send-email: test for pre-sanitized self name
1873 send-email: add test for duplicate utf8 name
1874 send-email: sanitize author when writing From line
1876 Ramkumar Ramachandra (6):
1877 sha1_name: fix error message for @{u}
1878 sha1_name: fix error message for @{<N>}, @{<date>}
1879 diffcore-pickaxe: make error messages more consistent
1880 diffcore-pickaxe doc: document -S and -G properly
1881 check-ignore doc: fix broken link to ls-files page
1882 fixup-builtins: retire an old transition helper script
1885 t5004: avoid using tar for checking emptiness of archive
1886 t5004: resurrect original empty tar archive test
1889 Documentation/merge-options.txt: restore `-e` option
1892 test: spell 'ls-files --delete' option correctly in test descriptions
1895 pull: merge into unborn by fast-forwarding from empty tree
1896 apply: carefully strdup a possibly-NULL name
1898 Torsten Bögershausen (1):
1899 t7400: test of UTF-8 submodule names pass under Mac OS
1902 help: add help_unknown_ref()
1903 merge: use help_unknown_ref()
1906 Version v1.8.3.2; changes since v1.8.3.1:
1907 -----------------------------------------
1909 Felipe Contreras (1):
1910 prompt: fix for simple rebase
1913 t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
1914 t2024: Show failure to use refspec when DWIMming remote branch names
1915 checkout: Use remote refspecs when DWIMming tracking branches
1916 t3200.39: tracking setup should fail if there is no matching refspec.
1917 t7201.24: Add refspec to keep --track working
1918 t9114.2: Don't use --track option against "svn-remote"-tracking branches
1919 branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
1920 glossary: Update and rephrase the definition of a remote-tracking branch
1923 contrib/subtree: don't delete remote branches if split fails
1926 strbuf_branchname(): do not double-expand @{-1}~22
1927 Start preparing for 1.8.3.2
1931 difftool --dir-diff: allow changing any clean working tree file
1934 t6019: demonstrate --ancestry-path A...B breakage
1935 revision.c: treat A...B merge bases as if manually specified
1937 Matthijs Kooijman (1):
1938 combine-diff.c: Fix output when changes are exactly 3 lines apart
1940 Michael Heemskerk (2):
1941 upload-pack: ignore 'shallow' lines with unknown obj-ids
1942 t5500: add test for fetching with an unknown 'shallow'
1944 Nguyễn Thái Ngọc Duy (3):
1945 clone: let the user know when check_everything_connected is run
1946 urls.txt: avoid auto converting to hyperlink
1947 fetch-pack: prepare updated shallow file before fetching the pack
1949 Ramkumar Ramachandra (4):
1950 push: factor out the detached HEAD error message
1951 push: fail early with detached HEAD and current
1952 push: make push.default = current use resolved HEAD
1953 completion: complete diff --word-diff
1956 commit: don't start editor if empty message is given with -m
1958 Stefano Lattarini (1):
1959 configure: fix option help message for --disable-pthreads
1961 Thomas Gummerer (1):
1962 prompt: fix show upstream with svn and zsh
1965 Document push --no-verify
1967 Torsten Bögershausen (1):
1968 t0070 "mktemp to unwritable directory" needs SANITY
1970 Wieland Hoffmann (1):
1971 pre-push.sample: Make the script executable
1974 Version v1.8.3.1; changes since v1.8.3:
1975 ---------------------------------------
1978 mingw: make mingw_signal return the correct handler
1980 Felipe Contreras (1):
1981 sha1_file: trivial style cleanup
1983 Fredrik Gustafsson (1):
1984 Document .git/modules
1986 Jonathan Nieder (1):
1987 config: allow inaccessible configuration under $HOME
1990 Start 1.8.3.1 maintenance track
1991 t/README: test_must_fail is for testing Git
1995 dir.c: fix ignore processing within not-ignored directories
1998 trivial: Add missing period in documentation
2001 submodule: remove redundant check for the_index.initialized
2004 Version v1.8.3; changes since v1.8.3-rc3:
2005 -----------------------------------------
2008 remote-hg: set stdout to binary mode on win32
2010 Felipe Contreras (3):
2011 completion: regression fix for zsh
2012 remote-hg: trivial configuration note cleanup
2013 remote-hg: fix order of configuration comments
2015 Jonathan Nieder (1):
2016 git-svn: clarify explanation of --destination argument
2022 git-svn: multiple fetch/branches/tags keys are supported
2025 git-svn: introduce --parents parameter for commands branch and tag
2028 Version v1.8.3-rc3; changes since v1.8.3-rc2:
2029 ---------------------------------------------
2032 git-submodule.txt: Clarify 'init' and 'add' subcommands.
2035 CodingGuidelines: Documentation/*.txt are the sources
2037 Felipe Contreras (13):
2038 remote-bzr: update old organization
2039 remote-hg: trivial cleanups
2040 remote-hg: get rid of unused exception checks
2041 remote-hg: enable track-branches in hg-git mode
2042 remote-hg: add new get_config_bool() helper
2043 remote-hg: fix new branch creation
2044 remote-hg: disable forced push by default
2045 remote-hg: don't push fake 'master' bookmark
2046 remote-hg: update bookmarks when pulling
2047 remote-bzr: fix cloning of non-listable repos
2048 Revert "remote-hg: update bookmarks when pulling"
2049 remote-bzr: fixes for older versions of bzr
2050 documentation: trivial style cleanups
2053 difftool: fix dir-diff when file does not exist in working tree
2059 gitk: Update Swedish translation (304t)
2061 Sandor Bodo-Merle (1):
2062 remote-bzr: fix old organization destroy
2065 Version v1.8.3-rc2; changes since v1.8.3-rc1:
2066 ---------------------------------------------
2069 gitk: Display the date of a tag in a human-friendly way
2072 mergetools/kdiff3: do not use --auto when diffing
2074 Felipe Contreras (25):
2075 remote-bzr: cleanup CustomTree
2076 remote-bzr: delay blob fetching until the very end
2077 remote-bzr: fix order of locking in CustomTree
2078 remote-bzr: always try to update the worktree
2079 remote-bzr: add support to push merges
2080 remote-bzr: fixes for branch diverge
2081 remote-bzr: fix partially pushed merge
2082 remote-bzr: use branch variable when appropriate
2083 remote-bzr: add support for bzr repos
2084 remote-bzr: fix branch names
2085 remote-bzr: add support for shared repo
2086 remote-bzr: improve author sanitazion
2087 remote-bzr: add custom method to find branches
2088 remote-bzr: add option to specify branches
2089 remote-bzr: improve progress reporting
2090 remote-bzr: iterate revisions properly
2091 remote-bzr: delay peer branch usage
2092 remote-bzr: access branches only when needed
2093 transport-helper: improve push messages
2094 remote-bzr: convert all unicode keys to str
2095 remote-bzr: avoid bad refs
2096 remote-bzr: fix for disappeared revisions
2097 remote-helpers: trivial cleanup
2098 transport-helper: trivial style cleanup
2099 gitk: Simplify file filtering
2101 Gauthier Östervall (1):
2102 gitk: Move hard-coded colors to .gitk
2105 l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)
2106 l10n: zh_CN.po: translate 44 messages (2080t0f0u)
2109 merge-tree: handle directory/empty conflict correctly
2111 Jonathan Nieder (1):
2112 Git::SVN::*: add missing "NAME" section to perldoc
2115 Update draft release notes for 1.8.3
2116 cherry-pick: picking a tag that resolves to a commit is OK
2121 gitk: Add menu item for reverting commits
2123 Martin Langhoff (1):
2124 gitk: Add support for -G'regex' pickaxe variant
2126 Michael Contreras (1):
2127 git-svn: avoid self-referencing mergeinfo
2130 gitk: Improve behaviour of drop-down lists
2133 git-svn: added an --include-path flag
2136 l10n: Update Swedish translation (2080t0f0u)
2139 l10n: de.po: translate 44 new messages
2142 t5004: ignore pax global header file
2143 t5004: avoid using tar for checking emptiness of archive
2145 Tair Sabirgaliev (1):
2146 gitk: On OSX, bring the gitk window to front
2148 Torsten Bögershausen (1):
2149 test-bzr: do not use unportable sed '\+'
2152 l10n: Update Vietnamese translation (2080t0f0u)
2155 Version v1.8.3-rc1; changes since v1.8.3-rc0:
2156 ---------------------------------------------
2158 Anders Granskogen Bjørnstad (1):
2159 Documentation/git-commit: Typo under --edit
2161 Felipe Contreras (5):
2162 completion: add missing format-patch options
2163 documentation: trivial whitespace cleanups
2164 complete: zsh: trivial simplification
2165 complete: zsh: use zsh completion for the main cmd
2166 completion: zsh: don't override suffix on _detault
2168 H. Merijn Brand (1):
2169 Git.pm: call tempfile from File::Temp as a regular function
2172 merge-tree: fix typo in "both changed identically"
2173 t/Makefile: remove smoke test targets
2176 Update draft release notes to 1.8.3
2180 Fix grammar in the 1.8.3 release notes.
2182 Ramkumar Ramachandra (5):
2183 git-completion.bash: lexical sorting for diff.statGraphWidth
2184 git-completion.bash: add diff.submodule to config list
2185 git-completion.bash: complete branch.*.rebase as boolean
2186 git-completion.bash: add branch.*.pushremote to config list
2187 git-completion.bash: add remote.pushdefault to config list
2189 Ramsay Allan Jones (2):
2190 clone: Make the 'junk_mode' symbol a file static
2191 pretty: Fix bug in truncation support for %>, %< and %><
2194 pretty: simplify input line length calculation in pp_user_info()
2195 pretty: simplify output line length calculation in pp_user_info()
2196 pretty: remove intermediate strbufs from pp_user_info()
2199 remote: add a test for extra arguments, according to docs
2200 remote: check for superfluous arguments in 'git remote add'
2201 remote: 'show' and 'prune' can take more than one remote
2202 unpack_entry: avoid freeing objects in base cache
2205 bash-prompt.sh: show where rebase is at when stopped
2208 Version v1.8.3-rc0; changes since v1.8.2.3:
2209 -------------------------------------------
2212 clone: Fix error message for reference repository
2213 clone: Allow repo using gitfile as a reference
2215 Antoine Pelisse (5):
2216 combine-diff: coalesce lost lines optimally
2217 fast-export: Allow pruned-references in mark file
2218 strbuf: create strbuf_humanise_bytes() to show byte sizes
2219 count-objects: add -H option to humanize sizes
2220 remote-hg: activate graphlog extension for hg_log()
2223 commit-tree: document -S option consistently
2226 commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
2227 t/test-lib-functions.sh: allow to specify the tag name to test_commit
2228 t/t3511: add some tests of 'cherry-pick -s' functionality
2229 sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
2230 sequencer.c: require a conforming footer to be preceded by a blank line
2231 sequencer.c: always separate "(cherry picked from" from commit body
2232 sequencer.c: teach append_signoff how to detect duplicate s-o-b
2233 sequencer.c: teach append_signoff to avoid adding a duplicate newline
2234 Unify appending signoff in format-patch, commit and sequencer
2235 t7502: perform commits using alternate editor in a subshell
2236 git-commit: populate the edit buffer with 2 blank lines before s-o-b
2238 Brian Gernhardt (3):
2239 t5550: do not assume the "matching" push is the default
2240 t5551: do not assume the "matching" push is the default
2241 t5570: do not assume the "matching" push is the default
2243 Christophe Simonis (3):
2244 remote-bzr: fix directory renaming
2245 remote-bzr: remove files before modifications
2246 remote-bzr: fix utf-8 support for fetching
2249 difftool: silence uninitialized variable warning
2250 t7800: update copyright notice
2251 t7800: modernize tests
2252 t7800: "defaults" is no longer a builtin tool name
2255 remote-bzr: set author if available
2258 remote-hg: add missing config variable in doc
2259 remote-hg: push to the appropriate branch
2260 remote-helpers: avoid has_key
2262 Felipe Contreras (64):
2263 remote-bzr: avoid echo -n
2264 remote-helpers: fix the run of all tests
2265 remote-bzr: remove stale check code for tests
2266 remote-hg: fix hg-git test-case
2267 remote-bzr: only update workingtree on local repos
2268 remote-bzr: avoid unreferred tags
2269 remote-bzr: add utf-8 support for pushing
2270 send-email: make annotate configurable
2271 format-patch: improve head calculation for cover-letter
2272 format-patch: refactor branch name calculation
2273 log: update to OPT_BOOL
2274 format-patch: add format.coverLetter configuration variable
2275 format-patch: trivial cleanups
2276 remote-bzr: improve tag handling
2277 remote-hg: trivial cleanups
2278 remote-hg: properly report errors on bookmark pushes
2279 remote-hg: make sure fake bookmarks are updated
2280 remote-hg: trivial test cleanups
2281 remote-hg: redirect buggy mercurial output
2282 remote-hg: split bookmark handling
2283 remote-hg: refactor export
2284 remote-hg: update remote bookmarks
2285 remote-hg: update tags globally
2286 remote-hg: force remote push
2287 remote-hg: show more proper errors
2288 remote-hg: add basic author tests
2289 remote-hg: add simple mail test
2290 remote-hg: fix bad state issue
2291 remote-hg: fix bad file paths
2292 completion: add more cherry-pick options
2293 completion: trivial test improvement
2294 completion: get rid of empty COMPREPLY assignments
2295 rebase-am: explicitly disable cover-letter
2296 completion: add new __gitcompadd helper
2297 completion: add __gitcomp_nl tests
2298 completion: get rid of compgen
2299 completion: inline __gitcomp_1 to its sole callsite
2300 completion: small optimization
2301 branch: colour upstream branches
2302 remote-bzr: fix prefix of tags
2303 remote-hg: safer bookmark pushing
2304 remote-hg: use python urlparse
2305 remote-hg: properly mark branches up-to-date
2306 remote-hg: add branch_tip() helper
2307 remote-hg: add support for tag objects
2308 remote-hg: custom method to write tags
2309 remote-hg: write tags in the appropriate branch
2310 remote-hg: add custom local tag write code
2311 remote-hg: improve email sanitation
2312 remote-hg: add support for schemes extension
2313 remote-hg: don't update bookmarks unnecessarily
2314 remote-hg: allow refs with spaces
2315 remote-hg: small performance improvement
2316 remote-hg: use marks instead of inlined files
2317 remote-hg: strip extra newline
2318 remote-bzr: use proper push method
2319 remote-helpers: trivial cleanups
2320 remote-hg: remove extra check
2321 remote-bzr: fix bad state issue
2322 remote-bzr: add support to push URLs
2323 remote-hg: use hashlib instead of hg sha1 util
2324 remote-bzr: store converted URL
2325 remote-bzr: tell bazaar to be quiet
2326 remote-bzr: strip extra newline
2329 log: read gpg settings for signed commit verification
2332 upload-pack: use get_sha1_hex to parse "shallow" lines
2333 upload-pack: do not add duplicate objects to shallow list
2334 upload-pack: remove packet debugging harness
2335 fetch-pack: fix out-of-bounds buffer offset in get_ack
2336 send-pack: prefer prefixcmp over memcmp in receive_status
2337 upload-archive: do not copy repo name
2338 upload-archive: use argv_array to store client arguments
2339 write_or_die: raise SIGPIPE when we get EPIPE
2340 pkt-line: move a misplaced comment
2341 pkt-line: drop safe_write function
2342 pkt-line: provide a generic reading function with options
2343 pkt-line: teach packet_read_line to chomp newlines
2344 pkt-line: move LARGE_PACKET_MAX definition from sideband
2345 pkt-line: provide a LARGE_PACKET_MAX static buffer
2346 pkt-line: share buffer/descriptor reading implementation
2347 teach get_remote_heads to read from a memory buffer
2348 remote-curl: pass buffer straight to get_remote_heads
2349 remote-curl: move ref-parsing code up in file
2350 remote-curl: always parse incoming refs
2351 t2200: check that "add -u" limits itself to subdirectory
2352 fast-export: rename handle_object function
2353 fast-export: do not load blob objects twice
2354 do not use GIT_TRACE_PACKET=3 in tests
2355 stream_blob_to_fd: detect errors reading from stream
2356 check_sha1_signature: check return value from read_istream
2357 read_istream_filtered: propagate read error from upstream
2358 avoid infinite loop in read_istream_loose
2359 add test for streaming corrupt blobs
2360 streaming_write_entry: propagate streaming errors
2361 add tests for cloning corrupted repositories
2362 clone: die on errors from unpack_trees
2363 clone: run check_everything_connected
2364 t1300: document some aesthetic failures of the config editor
2365 clone: leave repo in place after checkout errors
2366 t5516 (fetch-push): drop implicit arguments from helper functions
2367 t3200: test --set-upstream-to with bogus refs
2368 branch: factor out "upstream is not a branch" error messages
2369 branch: improve error message for missing --set-upstream-to ref
2370 branch: mention start_name in set-upstream error messages
2371 branch: give advice when tracking start-point is missing
2372 rm: do not complain about d/f conflicts during deletion
2373 t3600: test behavior of reverse-d/f conflict
2374 t3600: document failure of rm across symbolic links
2375 http: add HTTP_KEEP_ERROR option
2376 remote-curl: show server content on http errors
2377 remote-curl: let servers override http 404 advice
2378 remote-curl: always show friendlier 404 message
2379 remote-curl: consistently report repo url for http errors
2380 http: simplify http_error helper function
2381 http: re-word http error message
2382 remote-curl: die directly with http error messages
2383 http: drop http_error function
2384 http: set curl FAILONERROR each time we select a handle
2387 submodule: add 'deinit' command
2388 submodule deinit: clarify work tree removal message
2391 l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)
2392 l10n: zh_CN.po: translate 54 messages (2048t0f0u)
2393 i18n: branch: mark strings for translation
2396 Makefile: make mandir, htmldir and infodir absolute
2397 git-difftool(1): fix formatting of --symlink description
2398 difftool: avoid double slashes in symlink targets
2399 difftool --dir-diff: symlink all files matching the working tree
2400 refs.c: fix fread error handling
2401 t7800: move '--symlinks' specific test to the end
2402 difftool: don't overwrite modified files
2403 t7800: don't hide grep output
2404 t7800: fix tests when difftool uses --no-symlinks
2405 t7800: run --dir-diff tests with and without symlinks
2406 submodule: print graph output next to submodule log
2407 gitremote-helpers(1): clarify refspec behaviour
2408 merge-tree: don't print entries that match "local"
2409 fast-export: add --signed-tags=warn-strip mode
2410 transport-helper: pass --signed-tags=warn-strip to fast-export
2411 transport-helper: add 'signed-tags' capability
2414 http-backend: respect GIT_NAMESPACE with dumb clients
2416 John Szakmeister (1):
2417 git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X
2419 Jonathan Nieder (11):
2420 sequencer.c: rework search for start of footer to improve clarity
2421 shell doc: emphasize purpose and security model
2422 shell: new no-interactive-login command to print a custom message
2423 push test: use test_config when appropriate
2424 push test: simplify check of push result
2425 push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'
2426 add: make pathless 'add [-u|-A]' warning a file-global function
2427 add: make warn_pathless_add() a no-op after first call
2428 add -u: only show pathless 'add -u' warning when changes exist outside cwd
2429 add -A: only show pathless 'add -A' warning when changes exist outside cwd
2430 convert: The native line-ending is \r\n on MinGW
2433 branch: give better message when no names specified for rename
2435 Junio C Hamano (53):
2436 t5404: do not assume the "matching" push is the default
2437 t5505: do not assume the "matching" push is the default
2438 t5516: do not assume the "matching" push is the default
2439 t5517: do not assume the "matching" push is the default
2440 t5519: do not assume the "matching" push is the default
2441 t5531: do not assume the "matching" push is the default
2442 t7406: do not assume the "matching" push is the default
2443 t9400: do not assume the "matching" push is the default
2444 t9401: do not assume the "matching" push is the default
2445 simplify-merges: drop merge from irrelevant side branch
2446 config.mak.in: remove unused definitions
2447 parse_fetch_refspec(): clarify the codeflow a bit
2448 fetch: use struct ref to represent refs to be fetched
2449 upload-pack: optionally allow fetching from the tips of hidden refs
2450 fetch: fetch objects by their exact SHA-1 object names
2451 Makefile: do not export mandir/htmldir/infodir
2452 match_push_refs(): nobody sets src->peer_ref anymore
2453 commit.c: add clear_commit_marks_many()
2454 commit.c: add in_merge_bases_many()
2455 commit.c: use clear_commit_marks_many() in in_merge_bases_many()
2457 for_each_reflog_ent(): extract a helper to process a single entry
2458 for_each_recent_reflog_ent(): simplify opening of a reflog file
2459 reflog: add for_each_reflog_ent_reverse() API
2460 builtin/add.c: simplify boolean variables
2461 git add: start preparing for "git add <pathspec>..." to default to "-A"
2462 Start the post 1.8.2 cycle
2463 The first wave of topics for 1.8.3
2464 Update draft release notes to 1.8.3
2465 merge-one-file: remove stale comment
2466 merge-one-file: force content conflict for "both sides added" case
2467 Second wave of topics toward 1.8.3
2468 More topics from the second batch for 1.8.3
2469 peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish
2470 peel_onion(): teach $foo^{object} peeler
2471 Update draft release notes to 1.8.3
2472 Update draft release notes to 1.8.3
2473 Update draft release notes to 1.8.3
2474 Update draft release notes to 1.8.3
2475 Update draft release notes to 1.8.3
2476 Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013-01-17)
2477 Update dtaft release notes to 1.8.3
2478 Update draft release notes to 1.8.3
2479 git add: rework the logic to warn "git add <pathspec>..." default change
2480 Update draft release notes to 1.8.3
2481 Update draft release notes to 1.8.3
2482 git add: rephrase the "removal will cease to be ignored" warning
2483 Update draft release notes to 1.8.3
2484 git add: --ignore-removal is a better named --no-all
2485 git add: rephrase -A/--no-all warning
2486 Update draft release notes to 1.8.3
2487 git add: avoid "-u/-A without pathspec" warning on stat-dirty paths
2491 dir.c: git-status --ignored: don't drop ignored directories
2492 dir.c: git-status --ignored: don't list files in ignored directories
2493 dir.c: git-status --ignored: don't list empty ignored directories
2494 dir.c: git-ls-files --directories: don't hide empty directories
2495 dir.c: git-status --ignored: don't list empty directories as ignored
2496 dir.c: make 'git-status --ignored' work within leading directories
2497 dir.c: git-clean -d -X: don't delete tracked directories
2498 dir.c: factor out parts of last_exclude_matching for later reuse
2499 dir.c: move prep_exclude
2500 dir.c: unify is_excluded and is_path_excluded APIs
2501 dir.c: replace is_path_excluded with now equivalent is_excluded API
2502 dir.c: git-status: avoid is_excluded checks for tracked files
2503 dir.c: git-status --ignored: don't scan the work tree three times
2504 dir.c: git-status --ignored: don't scan the work tree twice
2507 mergetools/p4merge: swap LOCAL and REMOTE
2508 mergetools/p4merge: create a base if none available
2509 git-merge-one-file: style cleanup
2510 git-merge-one-file: send "ERROR:" messages to stderr
2511 checkout: abbreviate hash in suggest_reattach
2514 Fix `make install` when configured with autoconf
2516 Lukas Fleischer (3):
2517 attr.c: extract read_index_data() as read_blob_data_from_index()
2518 read_blob_data_from_index(): optionally return the size of blob data
2519 convert.c: remove duplicate code
2522 status: show 'revert' state and status hint
2523 status: show commit sha1 in "You are currently reverting" message
2524 add: add a blank line at the end of pathless 'add [-u|-A]' warning
2526 Michael Haggerty (1):
2527 rev-parse: clarify documentation for the --verify option
2529 Michal Nazarewicz (6):
2530 Git.pm: allow command_close_bidi_pipe to be called as method
2531 Git.pm: fix example in command_close_bidi_pipe documentation
2532 Git.pm: refactor command_close_bidi_pipe to use _cmd_close
2533 Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe
2534 Git.pm: add interface for git credential command
2535 git-send-email: use git credential to obtain password
2538 date.c: fix unsigned time_t comparison
2539 Fix time offset calculation in case of unsigned time_t
2542 cherry-pick: make sure all input objects are commits
2545 git p4: avoid expanding client paths in chdir
2547 Modestas Vainius (1):
2548 Support FTP-over-SSL/TLS for regular FTP
2550 Nguyễn Thái Ngọc Duy (28):
2551 git-count-objects.txt: describe each line in -v output
2552 t4014: more tests about appending s-o-b lines
2553 format-patch: update append_signoff prototype
2554 sha1_file: reorder code in prepare_packed_git_one()
2555 count-objects: report garbage files in pack directory too
2556 count-objects: report how much disk space taken by garbage files
2557 wt-status: move strbuf into read_and_strip_branch()
2558 wt-status: split wt_status_state parsing function out
2559 wt-status: move wt_status_get_state() out to wt_status_print()
2560 status: show more info than "currently not on any branch"
2561 branch: show more information when HEAD is detached
2562 Preallocate hash tables when the number of inserts are known in advance
2563 status, branch: fix the misleading "bisecting" message
2564 checkout: avoid unnecessary match_pathspec calls
2565 checkout: add --ignore-skip-worktree-bits in sparse checkout mode
2566 pretty: save commit encoding from logmsg_reencode if the caller needs it
2567 pretty: get the correct encoding for --pretty:format=%e
2568 pretty-formats.txt: wrap long lines
2569 pretty: share code between format_decoration and show_decorations
2570 utf8.c: move display_mode_esc_sequence_len() for use by other functions
2571 utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
2572 utf8.c: add reencode_string_len() that can handle NULs in string
2573 pretty: two phase conversion for non utf-8 commits
2574 pretty: split color parsing into a separate function
2575 pretty: add %C(auto) for auto-coloring
2576 pretty: support padding placeholders, %< %> and %><
2577 pretty: support truncating in %>, %< and %><
2578 pretty: support %>> that steal trailing spaces
2581 git p4 test: make sure P4CONFIG relative path works
2582 git p4 test: should honor symlink in p4 client root
2585 l10n: Update Swedish translation (2048t0f0u)
2587 Peter van Zetten (1):
2588 remote-hg: fix for files with spaces
2591 rebase: find orig_head unambiguously
2594 builtin/help.c: split "-a" processing into two
2595 builtin/help.c: add --guide option
2596 builtin/help.c: add list_common_guides_help() function
2597 help: mention -a and -g option, and 'git help <concept>' usage.
2598 doc: include --guide option description for "git help"
2601 l10n: de.po: translate 54 new messages
2603 Ramkumar Ramachandra (14):
2604 t5520: use test_config to set/unset git config variables (leftover bits)
2605 remote.c: simplify a bit of code using git_config_string()
2606 t5516 (fetch-push): update test description
2607 remote.c: introduce a way to have different remotes for fetch/push
2608 remote.c: introduce remote.pushdefault
2609 remote.c: introduce branch.<name>.pushremote
2610 git-shortlog.txt: remove (-h|--help) from OPTIONS
2611 revisions.txt: clarify the .. and ... syntax
2612 git-log.txt: order OPTIONS properly; move <since>..<until>
2613 git-log.txt: generalize <since>..<until>
2614 git-log.txt: rewrite note on why "--" may be required
2615 git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
2616 builtin/log.c: make usage string consistent with doc
2617 builtin/shortlog.c: make usage string consistent with log
2619 Ramsay Allan Jones (5):
2620 msvc: Fix compilation errors caused by poll.h emulation
2621 msvc: git-daemon: Fix linker "unresolved external" errors
2622 msvc: Fix build by adding missing symbol defines
2623 msvc: test-svn-fe: Fix linker "unresolved external" error
2624 msvc: avoid collisions between "tags" and "TAGS"
2627 archive-zip: use deflateInit2() to ask for raw compressed data
2629 Sebastian Götte (5):
2630 Move commit GPG signature verification to commit.c
2631 commit.c/GPG signature verification: Also look at the first GPG status line
2632 merge/pull: verify GPG signatures of commits being merged
2633 merge/pull Check for untrusted good GPG signatures
2634 pretty printing: extend %G? to include 'N' and 'U'
2636 Sebastian Schuberth (1):
2637 git-svn: Support custom tunnel schemes instead of SSH only
2640 git-am: show the final log message on "Applying:" indicator
2641 remote-hg: add 'insecure' option
2642 remote-hg: document location of stored hg repository
2643 help: mark common_guides[] as translatable
2645 Stefano Lattarini (1):
2646 zlib: fix compilation failures with Sun C Compilaer
2649 safe_create_leading_directories: fix race that could give a false negative
2652 Add contrib/credentials/netrc with GPG support
2655 sha1_file: remove recursion in packed_object_info
2656 Refactor parts of in_delta_base_cache/cache_or_unpack_entry
2657 sha1_file: remove recursion in unpack_entry
2658 Avoid loading commits twice in log with diffs
2659 t/README: --valgrind already implies -v
2660 tests: parameterize --valgrind option
2661 tests --valgrind: provide a mode without --track-origins
2662 tests: notice valgrind error in test_must_fail
2664 Timotheus Pokorra (1):
2665 remote-bzr: add utf-8 support for fetching
2668 t9903: Don't fail when run from path accessed through symlink
2669 bisect: Store first bad commit as comment in log file
2670 bisect: Log possibly bad, skipped commits at bisection end
2672 Torsten Bögershausen (4):
2673 Make core.sharedRepository work under cygwin 1.7
2674 path.c: simplify adjust_shared_perm()
2675 path.c: optimize adjust_shared_perm()
2676 test-bzr: portable shell and utf-8 strings for Mac OS
2679 l10n: vi.po: Update translation (2048t0u0f)
2682 t3400: use test_config to set/unset git config variables
2683 t4304: use test_config to set/unset git config variables
2684 t4034: use test_config/test_unconfig to set/unset git config variables
2685 t4202: use test_config/test_unconfig to set/unset git config variables
2686 t5520: use test_config to set/unset git config variables
2687 t5541: use test_config to set/unset git config variables
2688 t7500: use test_config to set/unset git config variables
2689 t7508: use test_config to set/unset git config variables
2690 t9500: use test_config to set/unset git config variables
2691 t7502: use test_config to set/unset git config variables
2692 t7502: remove clear_config
2693 t7600: use test_config to set/unset git config variables
2696 Version v1.8.2.3; changes since v1.8.2.2:
2697 -----------------------------------------
2699 Anders Granskogen Bjørnstad (1):
2700 Documentation/git-commit: Typo under --edit
2703 mergetools/kdiff3: do not use --auto when diffing
2705 Felipe Contreras (5):
2706 documentation: trivial whitespace cleanups
2707 complete: zsh: trivial simplification
2708 complete: zsh: use zsh completion for the main cmd
2709 completion: zsh: don't override suffix on _detault
2710 transport-helper: trivial style cleanup
2713 t/Makefile: remove smoke test targets
2715 Jonathan Nieder (1):
2716 glossary: a revision is just a commit
2721 Ramkumar Ramachandra (3):
2722 git-completion.bash: lexical sorting for diff.statGraphWidth
2723 git-completion.bash: add diff.submodule to config list
2724 git-completion.bash: complete branch.*.rebase as boolean
2727 t5004: ignore pax global header file
2728 t5004: avoid using tar for checking emptiness of archive
2731 read_revisions_from_stdin: make copies for handle_revision_arg
2732 remote: add a test for extra arguments, according to docs
2733 remote: check for superfluous arguments in 'git remote add'
2734 remote: 'show' and 'prune' can take more than one remote
2737 Version v1.8.2.2; changes since v1.8.2.1:
2738 -----------------------------------------
2741 t: make PIPE a standard test prerequisite
2743 Antoine Pelisse (2):
2744 fix clang -Wtautological-compare with unsigned enum
2745 Allow combined diff to ignore white-spaces
2748 Typo fix: replacing it's -> its
2750 Carlos Martín Nieto (1):
2751 Documentation/git-commit: reword the --amend explanation
2754 help.c: add a compatibility comment to cmd_version()
2756 Felipe Contreras (2):
2757 remote-hg: fix commit messages
2758 prompt: fix untracked files for zsh
2761 gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
2764 submodule: clarify logic in show_submodule_summary
2765 filter-branch: return to original dir after filtering
2766 diffcore-pickaxe: remove fill_one()
2767 diffcore-pickaxe: unify code for log -S/-G
2768 show-branch: use strbuf instead of static buffer
2769 doc/http-backend: clarify "half-auth" repo configuration
2770 doc/http-backend: give some lighttpd config examples
2771 doc/http-backend: match query-string in apache half-auth example
2772 t/test-lib.sh: drop "$test" variable
2773 usage: allow pluggable die-recursion checks
2774 run-command: use thread-aware die_is_recursing routine
2775 cat-file: print tags raw for "cat-file -p"
2776 receive-pack: close sideband fd on early pack errors
2779 i18n: make the translation of -u advice in one go
2782 rerere forget: grok files containing NUL
2783 rerere forget: do not segfault if not all stages are present
2784 t6200: avoid path mangling issue on Windows
2787 diffcore-break: don't divide by zero
2788 bisect: avoid signed integer overflow
2789 git-merge(1): document diff-algorithm option to merge-recursive
2790 diff: allow unstuck arguments with --diff-algorithm
2791 t/test-lib.sh: fix TRASH_DIRECTORY handling
2793 Jonathan Nieder (1):
2794 gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
2796 Junio C Hamano (13):
2797 merge: a random object may not necssarily be a commit
2798 apply --whitespace=fix: avoid running over the postimage buffer
2799 t5516: test interaction between pushURL and pushInsteadOf correctly
2800 test: resurrect q_to_tab
2801 t6200: use test_config/test_unconfig
2802 t6200: test message for merging of an annotated tag
2803 diffcore-pickaxe: port optimization from has_changes() to diff_grep()
2804 diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"
2805 glossary: extend "detached HEAD" description
2806 doc: clarify that "git daemon --user=<user>" option does not export HOME=~user
2807 Start preparing for 1.8.2.2
2808 Update draft release notes to 1.8.2.2
2812 cherry-pick/revert: make usage say '<commit-ish>...'
2814 Lukas Fleischer (1):
2815 bundle: Accept prerequisites without commit messages
2817 Martin von Gagern (1):
2818 Documentation: Strip texinfo anchors to avoid duplicates
2820 Mårten Kongstad (1):
2821 completion: remove duplicate block for "git commit -c"
2824 fast-export: fix argument name in error messages
2826 Peter Eisentraut (1):
2827 pull: Apply -q and -v options to rebase mode as well
2830 fmt-merge-msg: respect core.commentchar in people credits
2831 fmt-merge-msg: use core.commentchar in tag signatures completely
2833 Ramkumar Ramachandra (4):
2834 t3200 (branch): modernize style
2835 send-email: use "return;" not "return undef;" on error codepaths
2836 send-email: drop misleading function prototype
2837 send-email: use the three-arg form of open in recipients_cmd
2840 match-trees: simplify score_trees() using tree_entry()
2841 t5004: fix issue with empty archive test and bsdtar
2842 archive: clarify explanation of --worktree-attributes
2843 pretty: handle broken commit headers gracefully
2844 blame: handle broken commit headers gracefully
2846 Robin Rosenberg (1):
2847 bash: teach __git_ps1 about REVERT_HEAD
2850 diffcore-pickaxe: remove unnecessary call to get_textconv()
2851 diffcore-pickaxe: respect --no-textconv
2852 t/README: --immediate skips cleanup commands for failed tests
2855 Documentation: distinguish between ref and offset deltas in pack-format
2857 Stefano Lattarini (9):
2858 doc: various spelling fixes
2859 git-remote-mediawiki: spelling fixes
2860 contrib/subtree: fix spelling of accidentally
2861 obstack: fix spelling of similar
2862 compat/regex: fix spelling and grammar in comments
2863 compat/nedmalloc: fix spelling in comments
2864 precompose-utf8: fix spelling of "want" in error message
2865 kwset: fix spelling in comments
2866 Correct common spelling mistakes in comments and tests
2868 Thomas Ackermann (4):
2869 glossary: remove outdated/misleading/irrelevant entries
2870 glossary: improve description of SHA-1 related topics
2871 The name of the hash function is "SHA-1", not "SHA1"
2872 glossary: improve definitions of refspec and pathspec
2875 perl: redirect stderr to /dev/null instead of closing
2876 t9700: do not close STDERR
2878 Torsten Bögershausen (5):
2879 t9020: do not use export X=Y
2880 t9501: do not use export X=Y
2881 test-hg-bidi.sh: do not use export X=Y
2882 test-hg-hg-git.sh: do not use export X=Y
2883 t7409: do not use export X=Y
2886 Version v1.8.2.1; changes since v1.8.2:
2887 ---------------------------------------
2890 setup.c: stop prefix_pathspec() from looping past the end of string
2891 setup.c: check that the pathspec magic ends with ")"
2893 Antoine Pelisse (3):
2894 update-index: allow "-h" to also display options
2895 diff: Fix rename pretty-print when suffix and prefix overlap
2896 tests: make sure rename pretty print works
2899 t/t7502: compare entire commit message with what was expected
2900 t7502: demonstrate breakage with a commit message with trailing newlines
2901 git-commit: only append a newline to -m mesg if necessary
2902 Documentation/git-commit.txt: rework the --cleanup section
2904 Christian Helmuth (1):
2905 git-commit doc: describe use of multiple `-m` options
2908 Correct the docs about GIT_SSH.
2911 git-sh-setup: use a lowercase "usage:" string
2912 git-svn: use a lowercase "usage:" string
2913 git-relink: use a lowercase "usage:" string
2914 git-merge-one-file: use a lowercase "usage:" string
2915 git-archimport: use a lowercase "usage:" string
2916 git-cvsexportcommit: use a lowercase "usage:" string
2917 git-cvsimport: use a lowercase "usage:" string
2918 git-cvsimport: use a lowercase "usage:" string
2919 contrib/credential: use a lowercase "usage:" string
2920 contrib/fast-import: use a lowercase "usage:" string
2921 contrib/fast-import/import-zips.py: fix broken error message
2922 contrib/fast-import/import-zips.py: use spaces instead of tabs
2923 contrib/examples: use a lowercase "usage:" string
2924 contrib/hooks/setgitperms.perl: use a lowercase "usage:" string
2925 templates/hooks--update.sample: use a lowercase "usage:" string
2926 Documentation/user-manual.txt: use a lowercase "usage:" string
2927 git-svn: use a lowercase "usage:" string
2928 tests: use a lowercase "usage:" string
2929 contrib/examples/git-remote.perl: use a lowercase "usage:" string
2930 contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string
2933 git-compat-util.h: Provide missing netdb.h definitions
2936 Fix ".git/refs" stragglers
2937 describe: Document --match pattern format
2940 utf8: accept alternate spellings of UTF-8
2941 mailsplit: sort maildir filenames more cleverly
2942 cache.h: drop LOCAL_REPO_ENV_SIZE
2943 environment: add GIT_PREFIX to local_repo_env
2944 setup: suppress implicit "." work-tree for bare repos
2945 test-lib: factor out $GIT_UNZIP setup
2946 archive: handle commits with an empty tree
2947 upload-pack: drop lookup-before-parse optimization
2948 upload-pack: make sure "want" objects are parsed
2949 upload-pack: load non-tip "want" objects from disk
2950 avoid segfaults on parse_object failure
2951 use parse_object_or_die instead of die("bad object")
2952 pack-refs: write peeled entry for non-tags
2953 index-pack: always zero-initialize object_entry list
2954 fast-import: use pointer-to-pointer to keep list tail
2955 drop some obsolete "x = x" compiler warning hacks
2956 transport: drop "int cmp = cmp" hack
2957 run-command: always set failed_errno in start_command
2958 fast-import: clarify "inline" logic in file_change_m
2959 wt-status: fix possible use of uninitialized variable
2960 dir.c::match_pathname(): adjust patternlen when shifting pattern
2961 dir.c::match_pathname(): pay attention to the length of string parameters
2962 t: check that a pattern without trailing slash matches a directory
2965 t2003: work around path mangling issue on Windows
2968 Revert "graph.c: mark private file-scope symbols as static"
2969 t2003: modernize style
2970 entry: fix filter lookup
2971 merge-tree: fix typo in merge-tree.c::unresolved
2974 Git.pm: fix cat_blob crashes on large files
2976 Junio C Hamano (21):
2977 imap-send: support Server Name Indication (RFC4366)
2978 diff-options: unconfuse description of --color
2979 describe: --match=<pattern> must limit the refs even when used with --all
2980 reflog: fix typo in "reflog expire" clean-up codepath
2981 Documentation/git-push: clarify the description of defaults
2982 git status: document trade-offs in choosing parameters to the -u option
2983 CodingGuidelines: our documents are in AsciiDoc
2984 Documentation: merging a tag is a special case
2985 transport.c: help gcc 4.6.3 users by squelching compiler warning
2986 Start preparing for 1.8.2.1
2987 attr.c::path_matches(): the basename is part of the pathname
2988 More corrections for 1.8.2.1
2989 More fixes for 1.8.2.1
2990 attr.c::path_matches(): special case paths that end with a slash
2991 dir.c::match_basename(): pay attention to the length of string parameters
2992 Update draft release notes to 1.8.2.1
2993 Start preparing for 1.8.1.6
2994 Update draft release notes to 1.8.2.1
2995 mailmap: update Pasky's address
3000 rev-parse: clarify documentation of $name@{upstream} syntax
3001 t1507: Test that branchname@{upstream} is interpreted as branch
3002 Fix revision walk for commits with the same dates
3005 name-hash.c: fix endless loop with core.ignorecase=true
3008 format-patch: RFC 2047 says multi-octet character may not be split
3010 Lukas Fleischer (2):
3011 bundle: Fix "verify" output if history is complete
3012 bundle: Add colons to list headings in "verify"
3014 Matthias Krüger (1):
3015 git help config: s/insn/instruction/
3018 git-remote-mediawiki: new wiki URL in documentation
3021 diff.c: diff.renamelimit => diff.renameLimit in message
3023 Michael Haggerty (1):
3024 pack-refs: add fully-peeled trait
3026 Michael J Gruber (5):
3027 gpg-interface: check good signature in a reliable way
3028 log-tree: rely upon the check in the gpg_interface
3029 gpg_interface: allow to request status return
3030 pretty: parse the gpg status lines rather than the output
3031 pretty: make %GK output the signing key for signed commits
3034 git-pull doc: fix grammo ("conflicts" is plural)
3036 Nguyễn Thái Ngọc Duy (7):
3037 index-format.txt: mention of v4 is missing in some places
3038 read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
3039 branch: segfault fixes and validation
3040 update-index: list supported idx versions and their features
3041 status: advise to consider use of -u when read_directory takes too long
3042 index-pack: fix buffer overflow caused by translations
3043 index-pack: protect deepest_delta in multithread code
3046 tag: --force does not have to warn when creating tags
3048 Ramkumar Ramachandra (1):
3049 t4018,7810,7811: remove test_config() redefinition
3051 Ramsay Allan Jones (2):
3052 fast-import: Fix an gcc -Wuninitialized warning
3053 cat-file: Fix an gcc -Wuninitialized warning
3056 archive-zip: fix compressed size for stored export-subst files
3057 Makefile: keep LIB_H entries together and sorted
3058 sha1_name: pass object name length to diagnose_invalid_sha1_path()
3059 submodule summary: support --summary-limit=<n>
3061 Tadeusz Andrzej Kadłubowski (2):
3062 git-filter-branch.txt: clarify ident variables usage
3063 Documentation: filter-branch env-filter example
3066 diff: prevent pprint_rename from underrunning input
3067 index-pack: guard nr_resolved_deltas reads by lock
3068 git-tag(1): we tag HEAD by default
3070 Torsten Bögershausen (1):
3071 remote-helpers/test-bzr.sh: do not use "grep '\s'"
3074 Documentation/githooks: Explain pre-rebase parameters
3075 user-manual: Standardize backtick quoting
3077 William Entriken (1):
3078 submodule update: when using recursion, show full path
3081 Version v1.8.2; changes since v1.8.2-rc3:
3082 -----------------------------------------
3084 Antoine Pelisse (1):
3085 perf: update documentation of GIT_PERF_REPEAT_COUNT
3088 git svn: consistent spacing after "W:" in warnings
3091 add: Clarify documentation of -A and -u
3094 git svn: ignore partial svn:mergeinfo
3097 Update draft release notes to 1.8.2
3101 Translate git_more_info_string consistently
3102 git.c: make usage match manual page
3105 add: update pathless 'add [-u|-A]' warning to reflect change of plan
3106 git-completion.bash: zsh does not implement function redirection correctly
3109 Version v1.8.2-rc3; changes since v1.8.2-rc2:
3110 ---------------------------------------------
3112 Fredrik Gustafsson (1):
3113 gitweb/README: remove reference to git.kernel.org
3116 l10n: git.pot: v1.8.2 round 4 (1 changed)
3117 l10n: zh_CN.po: translate 1 new message
3123 git-completion.zsh: define __gitcomp_file compatibility function
3126 l10n: Update Swedish translation (2009t0f0u)
3129 l10n: de.po: translate 35 new messages
3130 l10n: de.po: translate 5 new messages
3131 l10n: de.po: correct translation of "bisect" messages
3132 l10n: de.po: translate 1 new message
3135 l10n: vi.po: Update translation (2009t0f0u)
3138 Version v1.8.2-rc2; changes since v1.8.2-rc1:
3139 ---------------------------------------------
3142 Documentation/githooks: Fix linkgit
3145 Documentation/submodule: Add --force to update synopsis
3148 Revert "compat: add strtok_r()"
3151 Update draft release notes to 1.8.1.5
3156 wincred: accept CRLF on stdin to simplify console usage
3157 wincred: improve compatibility with windows versions
3159 Michael Haggerty (1):
3160 Provide a mechanism to turn off symlink resolution in ceiling paths
3163 Make !pattern in .gitattributes non-fatal
3166 Version v1.8.2-rc1; changes since v1.8.2-rc0:
3167 ---------------------------------------------
3170 t0008: document test_expect_success_multi
3173 Documentation: "advice" is uncountable
3176 Makefile: avoid infinite loop on configure.ac change
3179 l10n: Update git.pot (35 new, 14 removed messages)
3180 l10n: zh_CN.po: translate 35 new messages
3181 l10n: git.pot: v1.8.2 round 3 (5 new)
3182 l10n: zh_CN.po: translate 5 new messages
3183 Bugfix: undefined htmldir in config.mak.autogen
3186 doc: mention tracking for pull.default
3187 user-manual: typofix (ofthe->of the)
3188 RelNotes 1.8.2: push-simple will not be in effect in this release
3189 imap-send: move #ifdef around
3190 name-hash: allow hashing an empty string
3195 Martin Erik Werner (1):
3196 shell-prompt: clean up nested if-then
3199 git.txt: update description of the configuration mechanism
3201 Oswald Buddenhagen (2):
3202 imap-send: the subject of SSL certificate must match the host
3203 imap-send: support subjectAltName as well
3206 l10n: Update Swedish translation (2004t0f0u)
3207 l10n: Update Swedish translation (2009t0f0u)
3210 l10n: vi.po: update new strings (2004t0u0f)
3211 l10n: vi.po: Updated 5 new messages (2009t0f0u)
3214 user-manual: use 'remote add' to setup push URLs
3215 user-manual: give 'git push -f' as an alternative to +master
3216 user-manual: mention 'git remote add' for remote branch config
3217 user-manual: use 'git config --global user.*' for setup
3218 user-manual: use -o latest.tar.gz to create a gzipped tarball
3219 user-manual: Reorganize the reroll sections, adding 'git rebase -i'
3220 user-manual: Use request-pull to generate "please pull" text
3221 user-manual: Flesh out uncommitted changes and submodule updates
3224 Version v1.8.2-rc0; changes since v1.8.1.6:
3225 -------------------------------------------
3228 hooks: Add function to check if a hook exists
3229 push: Add support for pre-push hooks
3230 Add sample pre-push hook script
3233 tests: test number comes first in 'not ok $count - $message'
3234 tests: paint known breakages in yellow
3235 tests: paint skipped tests in blue
3236 tests: change info messages from yellow/brown to cyan
3237 tests: refactor mechanics of testing in a sub test-lib
3238 tests: test the test framework more thoroughly
3239 tests: paint unexpectedly fixed known breakages in bold red
3240 api-directory-listing.txt: update to match code
3241 Improve documentation and comments regarding directory traversal API
3242 dir.c: rename cryptic 'which' variable to more consistent name
3243 dir.c: rename path_excluded() to is_path_excluded()
3244 dir.c: rename excluded_from_list() to is_excluded_from_list()
3245 dir.c: rename excluded() to is_excluded()
3246 dir.c: refactor is_excluded_from_list()
3247 dir.c: refactor is_excluded()
3248 dir.c: refactor is_path_excluded()
3249 dir.c: rename free_excludes() to clear_exclude_list()
3250 dir.c: use a single struct exclude_list per source of excludes
3251 dir.c: keep track of where patterns came from
3252 dir.c: provide clear_directory() for reclaiming dir_struct memory
3253 dir.c: improve docs for match_pathspec() and match_pathspec_depth()
3254 add.c: remove unused argument from validate_pathspec()
3255 add.c: move pathspec matchers into new pathspec.c for reuse
3256 pathspec.c: rename newly public functions for clarity
3257 add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
3258 add.c: extract new die_if_path_beyond_symlink() for reuse
3259 setup.c: document get_pathspec()
3260 add git-check-ignore sub-command
3261 clean.c, ls-files.c: respect encapsulation of exclude_list_groups
3264 contrib/subtree: honor DESTDIR
3267 t7102 (reset): don't hardcode SHA-1 in expected outputs
3270 rebase: Handle cases where format-patch fails
3271 gitk: Refactor code for binding modified function keys
3272 gitk: Use bindshiftfunctionkey to bind Shift-F5
3274 Antoine Pelisse (8):
3275 Use split_ident_line to parse author and committer
3276 mailmap: simplify map_user() interface
3277 mailmap: add mailmap structure to rev_info and pp
3278 pretty: use mailmap to display username and email
3279 log: add --use-mailmap option
3280 test: add test for --use-mailmap option
3281 log: grep author/committer using mailmap
3282 log: add log.mailmap configuration option
3285 git-svn: Simplify calculation of GIT_DIR
3288 Add Auto-Submitted header to post-receive-email
3291 push: return reject reasons as a bitset
3292 push: add advice for rejected tag reference
3293 push: keep track of "update" state separately
3294 push: flag updates that require force
3295 push: require force for refs under refs/tags/
3296 push: require force for annotated tags
3297 push: clarify rejection of update to non-commit-ish
3298 push: cleanup push rules comment
3299 push: rename config variable for more general use
3300 push: allow already-exists advice to be disabled
3302 Christian Couder (4):
3303 Makefile: remove tracking of TCLTK_PATH
3304 Makefile: detect when PYTHON_PATH changes
3305 Makefile: replace "echo 1>..." with "echo >..."
3306 gitk: Ignore gitk-wish buildproduct
3308 Christoph J. Thompson (1):
3309 Honor configure's htmldir switch
3311 David A. Greene (3):
3312 contrib/subtree: remove test number comments
3313 contrib/subtree: better error handling for 'subtree add'
3314 contrib/subtree: fix synopsis
3317 mergetools/vim: remove redundant diff command
3318 mergetool--lib: improve show_tool_help() output
3319 mergetools: simplify how we handle "vim" and "defaults"
3320 mergetool--lib: simplify command expressions
3321 mergetool--lib: improve the help text in guess_merge_tool()
3322 mergetool--lib: add functions for finding available tools
3323 doc: generate a list of valid merge tools
3326 Support builds when sys/param.h is missing
3327 Detect when the passwd struct is missing pw_gecos
3328 Generalize the inclusion of strings.h
3330 Eric S. Raymond (1):
3331 Add checks to Python scripts for version dependencies.
3334 git-svn: cleanup sprintf usage for uppercasing hex
3336 Felipe Contreras (26):
3337 remote-testgit: properly check for errors
3338 fast-export: avoid importing blob marks
3339 remote-testgit: fix direction of marks
3340 remote-helpers: fix failure message
3341 Add new remote-bzr transport helper
3342 remote-bzr: add support for pushing
3343 remote-bzr: add support for remote repositories
3344 Rename git-remote-testgit to git-remote-testpy
3345 Add new simplified git-remote-testgit
3346 remote-testgit: remove non-local functionality
3347 remote-testgit: remove irrelevant test
3348 remote-testgit: cleanup tests
3349 remote-testgit: exercise more features
3350 remote-testgit: report success after an import
3351 remote-testgit: implement the "done" feature manually
3352 fast-export: trivial cleanup
3353 fast-export: fix comparison in tests
3354 fast-export: don't handle uninteresting refs
3355 fast-export: make sure updated refs get updated
3356 remote-bzr: update working tree upon pushing
3357 remote-bzr: add simple tests
3358 remote-bzr: add support for fecthing special modes
3359 remote-bzr: add support to push special modes
3360 remote-bzr: add support for older versions of bzr
3361 remote-bzr: detect local repositories
3362 remote-hg: store converted URL
3365 fsck: warn about '.' and '..' in trees
3366 fsck: warn about ".git" in trees
3367 mailmap: refactor mailmap parsing for non-file sources
3368 mailmap: support reading mailmap from blobs
3369 mailmap: clean up read_mailmap error handling
3370 mailmap: fix some documentation loose-ends for mailmap.blob
3371 mailmap: default mailmap.blob in bare repositories
3372 make error()'s constant return value more visible
3373 silence some -Wuninitialized false positives
3374 add global --literal-pathspecs option
3375 Makefile: hoist uname autodetection to config.mak.uname
3376 config: add helper function for parsing key names
3377 archive-tar: use parse_config_key when parsing config
3378 convert some config callbacks to parse_config_key
3379 userdiff: drop parse_driver function
3380 submodule: use parse_config_key when parsing config
3381 submodule: simplify memory handling in config parsing
3382 help: use parse_config_key for man config
3383 reflog: use parse_config_key in config callback
3384 commit: drop useless xstrdup of commit message
3385 logmsg_reencode: never return NULL
3386 logmsg_reencode: lazily load missing commit buffers
3387 fetch: run gc --auto after fetching
3388 fetch-pack: avoid repeatedly re-scanning pack directory
3389 docs: clarify git-branch --list behavior
3390 branch: let branch filters imply --list
3391 Documentation/Makefile: clean up MAN*_TXT lists
3392 log: re-encode commit messages before grepping
3394 Jesper L. Nielsen (1):
3395 contrib/subtree: make the manual directory if needed
3398 l10n: Update git.pot (11 new, 7 removed messages)
3401 t6130-pathspec-noglob: Windows does not allow a file named "f*"
3404 git-svn: teach find-rev to find near matches
3405 git_remote_helpers: allow building with Python 3
3406 git_remote_helpers: fix input when running under Python 3
3407 git_remote_helpers: force rebuild if python version changes
3408 git_remote_helpers: use 2to3 if building with Python 3
3409 svn-fe: allow svnrdump_sim.py to run with Python 3
3410 git-remote-testpy: hash bytes explicitly
3411 git-remote-testpy: don't do unbuffered text I/O
3412 git-remote-testpy: call print as a function
3413 git-mergetool: move show_tool_help to mergetool--lib
3414 git-mergetool: remove redundant assignment
3415 git-mergetool: don't hardcode 'mergetool' in show_tool_help
3416 git-difftool: use git-mergetool--lib for "--tool-help"
3417 mergetool--lib: don't call "exit" in setup_tool
3418 git-remote-testpy: fix path hashing on Python 3
3419 CodingGuidelines: add Python coding guidelines
3420 mergetool--lib: list user configured tools in '--tool-help'
3421 graph: output padding for merge subsequent parents
3422 diff: write prefix to the correct file
3423 diff.c: make constant string arguments const
3424 diff: add diff_line_prefix function
3425 diff.c: use diff_line_prefix() where applicable
3426 combine-diff.c: teach combined diffs about line prefix
3427 rebase -i: respect core.commentchar
3429 Jonathan Nieder (2):
3430 Git::SVN::Editor::T: pass $deletions to ->A and ->D
3431 git svn: do not overescape URLs (fallback case)
3433 Junio C Hamano (52):
3434 diff: accept --no-follow option
3435 blame: pay attention to --no-follow
3436 t6006: clean up whitespace
3437 log --format: teach %C(auto,black) to respect color config
3438 git-compat-util.h: do not #include <sys/param.h> by default
3439 builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
3440 builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
3441 builtin/log.c: stop using global patch_suffix
3442 get_patch_filename(): simplify function signature
3443 get_patch_filename(): drop "just-numbers" hack
3444 get_patch_filename(): split into two functions
3445 format-patch: add --reroll-count=$N option
3447 format-patch: document and test --reroll-count
3448 Update draft release notes to 1.8.2
3449 format-patch: give --reroll-count a short synonym -v
3450 Update draft release notes to 1.8.2
3451 string-list: allow case-insensitive string list
3452 Update draft release notes to 1.8.2
3453 mailmap: remove email copy and length limitation
3454 log --use-mailmap: optimize for cases without --author/--committer search
3455 Update draft release notes to 1.8.2
3456 clone: do not export and unexport GIT_CONFIG
3457 Update draft release notes to 1.8.2
3458 Makefile: add description on PERL/PYTHON_PATH
3459 Update draft release notes to 1.8.2
3460 Allow custom "comment char"
3461 push: fix "refs/tags/ hierarchy cannot be updated without --force"
3462 Update draft release notes to 1.8.2
3463 upload-pack: share more code
3464 Update draft release notes to 1.8.2
3465 Update draft release notes to 1.8.2
3466 push: further clean up fields of "struct ref"
3467 push: further simplify the logic to assign rejection reason
3468 push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
3469 push: finishing touches to explain REJECT_ALREADY_EXISTS better
3470 Update draft release notes to 1.8.2
3471 Update draft release notes to 1.8.2
3472 upload-pack: simplify request validation
3473 git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"
3474 Update draft release notes to 1.8.2
3475 Documentation: describe the "repository" in repository-layout
3476 Update draft release notes to 1.8.2
3477 apply: verify submodule commit object name better
3478 Update draft release notes to 1.8.2
3479 upload/receive-pack: allow hiding ref hierarchies
3480 Update draft release notes to 1.8.2
3481 Update draft release notes to 1.8.2
3482 Update draft release notes to 1.8.2
3483 Documentation/git-add: kill remaining <filepattern>
3484 Update draft release notes to 1.8.2
3488 git-completion.bash: add support for path completion
3491 completion: handle path completion and colon for tcsh script
3493 Marcus Karlsson (1):
3494 gitk: Fix crash when not using themed widgets
3496 Martin Erik Werner (3):
3497 shell prompt: add bash.showUntrackedFiles option
3498 t9903: add tests for bash.showUntrackedFiles
3499 t9903: add extra tests for bash.showDirtyState
3501 Martin von Zweigbergk (21):
3502 oneway_merge(): only lstat() when told to update worktree
3503 reset $pathspec: no need to discard index
3504 reset $pathspec: exit with code 0 if successful
3505 reset.c: pass pathspec around instead of (prefix, argv) pair
3506 reset: don't allow "git reset -- $pathspec" in bare repo
3507 reset.c: extract function for parsing arguments
3508 reset.c: remove unnecessary variable 'i'
3509 reset.c: extract function for updating {ORIG_,}HEAD
3510 reset.c: share call to die_if_unmerged_cache()
3511 reset --keep: only write index file once
3512 reset: avoid redundant error message
3513 reset.c: replace switch by if-else
3514 reset.c: move update_index_refresh() call out of read_from_tree()
3515 reset.c: move lock, write and commit out of update_index_refresh()
3516 reset [--mixed]: only write index file once
3517 reset.c: finish entire cmd_reset() whether or not pathspec is given
3518 reset.c: inline update_index_refresh()
3519 reset $sha1 $pathspec: require $sha1 only to be treeish
3520 reset: allow reset on unborn branch
3521 reset [--mixed]: use diff-based reset whether or not pathspec was given
3522 reset: update documentation to require only tree-ish with paths
3525 Make lock local to fetch_pack
3527 Use __VA_ARGS__ for all of error's arguments
3528 Allow building with xmlparse.h
3529 Makefile: don't run "rm" without any files
3531 Matthew Ogilvie (10):
3532 cvsserver: factor out git-log parsing logic
3533 cvsserver: cleanup extra slashes in filename arguments
3534 cvsserver: define a tag name character escape mechanism
3535 cvsserver: add misc commit lookup, file meta data, and file listing functions
3536 cvsserver: implement req_Sticky and related utilities
3537 cvsserver: generalize getmeta() to recognize commit refs
3538 cvsserver: Add version awareness to argsfromdir
3539 cvsserver: support -r and sticky tags for most operations
3540 cvsserver: add t9402 to test branch and tag refs
3541 cvsserver Documentation: new cvs ... -r support
3544 add: warn when -u or -A is used without pathspec
3545 Makefile: make script-related rules usable from subdirectories
3546 git-remote-mediawiki: use toplevel's Makefile
3547 completion: support 'git config --local'
3550 remote-hg: fix handling of file perms when pushing
3551 fix clang -Wunused-value warnings for error functions
3553 Michael Haggerty (22):
3554 Add new function strbuf_add_xml_quoted()
3555 xml_entities(): use function strbuf_addstr_xml_quoted()
3556 lf_to_crlf(): NUL-terminate msg_data::data
3557 imap-send: store all_msgs as a strbuf
3558 imap-send: correctly report errors reading from stdin
3559 imap-send: change msg_data from storing (ptr, len) to storing strbuf
3560 wrap_in_html(): use strbuf_addstr_xml_quoted()
3561 wrap_in_html(): process message in bulk rather than line-by-line
3562 imap-send.c: remove msg_data::flags, which was always zero
3563 imap-send.c: remove struct msg_data
3564 iamp-send.c: remove unused struct imap_store_conf
3565 imap-send.c: remove struct store_conf
3566 imap-send.c: remove struct message
3567 imap-send.c: remove some unused fields from struct store
3568 imap-send.c: inline parse_imap_list() in parse_list()
3569 imap-send.c: remove struct imap argument to parse_imap_list_l()
3570 imap-send.c: remove namespace fields from struct imap
3571 imap-send.c: remove unused field imap_store::trashnc
3572 imap-send.c: use struct imap_store instead of struct store
3573 imap-send.c: remove unused field imap_store::uidvalidity
3574 imap-send.c: fold struct store into struct imap_store
3575 imap-send.c: simplify logic in lf_to_crlf()
3577 Michal Privoznik (3):
3578 git-completion.bash: Autocomplete --minimal and --histogram for git-diff
3579 config: Introduce diff.algorithm variable
3580 diff: Introduce --diff-algorithm command line option
3582 Nguyễn Thái Ngọc Duy (43):
3583 ctype: make sane_ctype[] const array
3584 ctype: support iscntrl, ispunct, isxdigit and isprint
3585 Import wildmatch from rsync
3586 wildmatch: remove unnecessary functions
3587 wildmatch: follow Git's coding convention
3588 Integrate wildmatch to git
3589 t3070: disable unreliable fnmatch tests
3590 wildmatch: make wildmatch's return value compatible with fnmatch
3591 wildmatch: remove static variable force_lower_case
3592 wildmatch: fix case-insensitive matching
3593 wildmatch: adjust "**" behavior
3594 wildmatch: make /**/ match zero or more directories
3595 Support "**" wildcard in .gitignore and .gitattributes
3596 pathspec: save the non-wildcard length part
3597 test-wildmatch: avoid Windows path mangling
3598 pathspec: do exact comparison on the leading non-wildcard part
3599 pathspec: apply "*.c" optimization from exclude
3600 tree_entry_interesting: do basedir compare on wildcard patterns when possible
3601 config.txt: a few lines about branch.<name>.description
3602 wildmatch: fix "**" special case
3603 wildmatch: rename constants and update prototype
3604 compat/fnmatch: respect NO_FNMATCH* even on glibc
3605 wildmatch: make dowild() take arbitrary flags
3606 wildmatch: replace variable 'special' with better named ones
3607 wildmatch: support "no FNM_PATHNAME" mode
3608 test-wildmatch: add "perf" command to compare wildmatch and fnmatch
3609 wildmatch: make a special case for "*/" with FNM_PATHNAME
3610 wildmatch: advance faster in <asterisk> + <literal> patterns
3611 Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
3612 branch: delete branch description if it's empty
3613 t4014: a few more tests on cover letter using branch description
3614 format-patch: pick up correct branch name from symbolic ref
3615 format-patch: pick up branch description when no ref is specified
3616 upload-pack: only accept commits from "shallow" line
3617 fetch: add --unshallow for turning shallow repo into complete one
3618 upload-pack: fix off-by-one depth calculation in shallow clone
3619 fetch: elaborate --depth action
3620 Update :/abc ambiguity check
3621 grep: avoid accepting ambiguous revision
3622 branch: reject -D/-d without branch name
3623 branch: give a more helpful message on redundant arguments
3624 branch: mark more strings for translation
3625 status: show the branch name if possible in in-progress info
3628 gitk: Fix display of branch names on some commits
3629 gitk: Improve display of list of nearby tags and heads
3630 gitk: Display important heads even when there are many
3633 git p4: test sync/clone --branch behavior
3634 git p4: rearrange and simplify hasOrigin handling
3635 git p4: add comments to p4BranchesInGit
3636 git p4: inline listExistingP4GitBranches
3637 git p4: create p4/HEAD on initial clone
3638 git p4: verify expected refs in clone --bare test
3639 git p4: clone --branch should checkout master
3640 git p4 doc: fix branch detection example
3641 git p4: allow short ref names to --branch
3642 git p4: rearrange self.initialParent use
3643 git p4: fail gracefully on sync with no master branch
3644 git p4: fix sync --branch when no master branch
3645 git p4 test: keep P4CLIENT changes inside subshells
3646 git p4: fix submit when no master branch
3647 git p4: temp branch name should use / even on windows
3648 git p4: remove unused imports
3649 git p4: generate better error message for bad depot path
3650 git p4 test: use client_view to build the initial client
3651 git p4 test: avoid loop in client_view
3652 git p4 test: use client_view in t9806
3653 git p4 test: start p4d inside its db dir
3654 git p4 test: translate windows paths for cygwin
3655 git p4: remove unreachable windows \r\n conversion code
3656 git p4: scrub crlf for utf16 files on windows
3657 git p4 test: newline handling
3658 git p4 test: use LineEnd unix in windows tests too
3659 git p4 test: avoid wildcard * in windows
3660 git p4: cygwin p4 client does not mark read-only
3661 git p4 test: use test_chmod for cygwin
3662 git p4: disable read-only attribute before deleting
3663 git p4: avoid shell when mapping users
3664 git p4: avoid shell when invoking git rev-list
3665 git p4: avoid shell when invoking git config --get-all
3666 git p4: avoid shell when calling git config
3667 git p4: introduce gitConfigBool
3670 gitk: Update Swedish translation (296t)
3671 l10n: Update Swedish translation (1983t0f0u)
3674 git-svn: do not escape certain characters in paths
3677 l10n: de.po: address the user formally
3678 commit: make default of "cleanup" option configurable
3679 l10n: de.po: fix some minor issues
3680 l10n: de.po: translate 11 new messages
3681 l10n: de.po: translate "revision" consistently as "Revision"
3682 l10n: de.po: translate "reset" as "neu setzen"
3684 Ramsay Allan Jones (1):
3685 t3070: Disable some failing fnmatch tests
3688 t0008: avoid brace expansion
3689 pretty: use prefixcmp instead of memcmp on NUL-terminated strings
3690 refs: use strncmp() instead of strlen() and memcmp()
3692 Robin Rosenberg (1):
3693 Enable minimal stat checking
3696 gitk: Synchronize highlighting in file view when scrolling diff
3697 gitk: Highlight current search hit in orange
3698 gitk: Highlight first search result immediately on incremental search
3699 gitk: Work around empty back and forward images when buttons are disabled
3700 gitk: Fix error message when clicking on a connecting line
3701 gitk: When searching, only highlight files when in Patch mode
3704 gpg: allow translation of more error messages
3705 run-command: be more informative about what failed
3707 Sven Strickroth (2):
3708 mergetools: support TortoiseGitMerge
3709 mergetools: teach tortoisemerge to handle filenames with SP correctly
3712 contrib/subtree: use %B for split subject/body
3715 Update CodingGuidelines for Perl
3717 Thomas Ackermann (5):
3718 Documentation: avoid poor-man's small caps GIT
3719 Documentation: the name of the system is 'Git', not 'git'
3720 Documentation: do not use undefined terms git-dir and git-file
3721 Documentation: add a description for 'gitfile' to glossary
3722 Documentation: StGit is the right spelling, not StGIT
3724 Torsten Bögershausen (9):
3725 t9402: sed -i is not portable
3726 t9402: improve check_end_tree() and check_end_full_tree()
3727 t9402: Dont use test_must_fail cvs
3728 t9402: No space after IO-redirection
3729 t9402: Add missing &&; Code style
3730 t9402: Simplify git ls-tree
3731 t9402: Rename check.cvsCount and check.list
3732 t9402: Use TABs for indentation
3733 test: Add check-non-portable-shell.pl
3736 l10n: vi.po: updated Vietnamese translation
3739 submodule: add get_submodule_config helper funtion
3740 submodule update: add --remote for submodule's upstream changes
3741 submodule add: If --branch is given, record it in .gitmodules
3744 l10n: zh_CN.po: 800+ new translations on command usages
3747 Version v1.8.1.6; changes since v1.8.1.5:
3748 -----------------------------------------
3750 Antoine Pelisse (4):
3751 update-index: allow "-h" to also display options
3752 diff: Fix rename pretty-print when suffix and prefix overlap
3753 tests: make sure rename pretty print works
3754 perf: update documentation of GIT_PERF_REPEAT_COUNT
3756 Christian Helmuth (1):
3757 git-commit doc: describe use of multiple `-m` options
3760 Correct the docs about GIT_SSH.
3763 git-compat-util.h: Provide missing netdb.h definitions
3765 Fredrik Gustafsson (1):
3766 gitweb/README: remove reference to git.kernel.org
3769 describe: Document --match pattern format
3772 avoid segfaults on parse_object failure
3773 use parse_object_or_die instead of die("bad object")
3774 pack-refs: write peeled entry for non-tags
3775 dir.c::match_pathname(): adjust patternlen when shifting pattern
3776 dir.c::match_pathname(): pay attention to the length of string parameters
3777 t: check that a pattern without trailing slash matches a directory
3780 t2003: work around path mangling issue on Windows
3783 t2003: modernize style
3784 entry: fix filter lookup
3785 merge-tree: fix typo in merge-tree.c::unresolved
3788 Git.pm: fix cat_blob crashes on large files
3791 imap-send: support Server Name Indication (RFC4366)
3792 diff-options: unconfuse description of --color
3793 Documentation: merging a tag is a special case
3794 attr.c::path_matches(): the basename is part of the pathname
3795 attr.c::path_matches(): special case paths that end with a slash
3796 dir.c::match_basename(): pay attention to the length of string parameters
3797 Start preparing for 1.8.1.6
3801 rev-parse: clarify documentation of $name@{upstream} syntax
3802 t1507: Test that branchname@{upstream} is interpreted as branch
3803 Fix revision walk for commits with the same dates
3806 name-hash.c: fix endless loop with core.ignorecase=true
3809 Translate git_more_info_string consistently
3810 git.c: make usage match manual page
3812 Lukas Fleischer (2):
3813 bundle: Fix "verify" output if history is complete
3814 bundle: Add colons to list headings in "verify"
3816 Matthias Krüger (1):
3817 git help config: s/insn/instruction/
3819 Michael Haggerty (2):
3820 Provide a mechanism to turn off symlink resolution in ceiling paths
3821 pack-refs: add fully-peeled trait
3824 git-pull doc: fix grammo ("conflicts" is plural)
3826 Nguyễn Thái Ngọc Duy (4):
3827 index-format.txt: mention of v4 is missing in some places
3828 read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
3829 update-index: list supported idx versions and their features
3830 index-pack: fix buffer overflow caused by translations
3833 Makefile: keep LIB_H entries together and sorted
3834 sha1_name: pass object name length to diagnose_invalid_sha1_path()
3836 Tadeusz Andrzej Kadłubowski (2):
3837 git-filter-branch.txt: clarify ident variables usage
3838 Documentation: filter-branch env-filter example
3841 diff: prevent pprint_rename from underrunning input
3842 git-tag(1): we tag HEAD by default
3844 Torsten Bögershausen (1):
3845 remote-helpers/test-bzr.sh: do not use "grep '\s'"
3848 Documentation/githooks: Explain pre-rebase parameters
3851 Version v1.8.1.5; changes since v1.8.1.4:
3852 -----------------------------------------
3854 Andrej E Baranov (1):
3855 gitweb: refer to picon/gravatar images over the same scheme
3858 Documentation/githooks: Fix linkgit
3861 git-mergetool: print filename when it contains %
3864 Move Git::SVN::get_tz to Git::get_tz_offset
3865 perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases
3866 cvsimport: format commit timestamp ourselves without using strftime
3869 Documentation/submodule: Add --force to update synopsis
3872 mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
3873 difftool--helper: fix printf usage
3874 p4merge: fix printf usage
3877 parse-options: report uncorrupted multi-byte options
3880 Documentation: "advice" is uncountable
3883 http_request: reset "type" strbuf before adding
3884 Makefile: avoid infinite loop on configure.ac change
3887 Add utf8_fprintf helper that returns correct number of columns
3890 Rename {git- => git}remote-helpers.txt
3891 builtin/apply: tighten (dis)similarity index parsing
3892 t4038: add tests for "diff --cc --raw <trees>"
3895 doc: mention tracking for pull.default
3896 combine-diff: lift 32-way limit of combined diff
3897 t5551: fix expected error output
3898 user-manual: typofix (ofthe->of the)
3900 Update draft release notes to 1.8.1.5
3904 git.txt: update description of the configuration mechanism
3906 Michael J Gruber (1):
3907 git-bisect.txt: clarify that reset quits bisect
3909 Nguyễn Thái Ngọc Duy (1):
3910 clone: forbid --bare --separate-git-dir <dir>
3912 Shawn O. Pearce (1):
3913 Verify Content-Type from smart HTTP servers
3916 Make !pattern in .gitattributes non-fatal
3919 user-manual: Update for receive.denyCurrentBranch=refuse
3920 user-manual: Reorganize the reroll sections, adding 'git rebase -i'
3921 user-manual: Use request-pull to generate "please pull" text
3922 user-manual: Flesh out uncommitted changes and submodule updates
3925 git-clean: Display more accurate delete messages
3928 Version v1.8.1.4; changes since v1.8.1.3:
3929 -----------------------------------------
3932 imap-send: move #ifdef around
3936 Replace filepattern with pathspec for consistency
3938 Oswald Buddenhagen (2):
3939 imap-send: the subject of SSL certificate must match the host
3940 imap-send: support subjectAltName as well
3943 user-manual: Fix 'both: so' -> 'both; so' typo
3944 user-manual: Fix 'http' -> 'HTTP' typos
3945 user-manual: Fix 'you - Git' -> 'you--Git' typo
3946 user-manual: Rewrite git-gc section for automatic packing
3947 user-manual: use 'remote add' to setup push URLs
3948 user-manual: give 'git push -f' as an alternative to +master
3949 user-manual: mention 'git remote add' for remote branch config
3950 user-manual: use 'git config --global user.*' for setup
3951 user-manual: use -o latest.tar.gz to create a gzipped tarball
3954 Version v1.8.1.3; changes since v1.8.1.2:
3955 -----------------------------------------
3958 git-completion.bash: replace zsh notation that breaks bash 3.X
3959 git-p4.py: support Python 2.5
3960 git-p4.py: support Python 2.4
3962 Dmitry V. Levin (1):
3963 am: invoke perl's strftime in C locale
3965 Fraser Tweedale (1):
3966 push: fix segfault when HEAD points nowhere
3969 git-cvsimport.txt: cvsps-2 is deprecated
3971 Jonathan Nieder (2):
3972 ident: do not drop username when reading from /etc/mailname
3973 Makefile: explicitly set target name for autogenerated dependencies
3975 Junio C Hamano (17):
3976 Which merge_file() function do you mean?
3977 merge-tree: lose unused "flags" from merge_list
3978 merge-tree: lose unused "resolve_directories"
3979 merge-tree: add comments to clarify what these functions are doing
3980 merge-tree: fix d/f conflicts
3981 Documentation: update "howto maintain git"
3982 howto/maintain: mark titles for asciidoc
3983 help: include <common-cmds.h> only in one file
3984 t9902: protect test from stray build artifacts
3985 howto/maintain: document "### match next" convention in jch/pu branch
3986 README: update stale and/or incorrect information
3987 INSTALL: git-p4 does not support Python 3
3988 git-am: record full index line in the patch used while rebasing
3989 apply: simplify build_fake_ancestor()
3990 apply: diagnose incomplete submodule object name better
3991 Start preparing for 1.8.1.3
3994 Martin von Zweigbergk (2):
3995 tests: move test_cmp_rev to test-lib-functions
3996 learn to pick/revert into unborn branch
3998 Nguyễn Thái Ngọc Duy (4):
3999 attr: fix off-by-one directory component length calculation
4000 test-lib.sh: unfilter GIT_PERF_*
4001 attr: avoid calling find_basename() twice per path
4002 branch: no detached HEAD check when editing another branch's description
4005 rebase --preserve-merges: keep all merge commits including empty ones
4007 Ramsay Allan Jones (1):
4008 Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
4011 gpg: close stderr once finished with it in verify_signed_buffer()
4013 Torsten Bögershausen (3):
4014 t0050: known breakage vanished in merge (case change)
4015 t0050: honor CASE_INSENSITIVE_FS in add (with different case)
4016 t0050: Use TAB for indentation
4019 Version v1.8.1.2; changes since v1.8.1.1:
4020 -----------------------------------------
4022 Antoine Pelisse (3):
4023 dir.c: Make git-status --ignored more consistent
4024 git-status: Test --ignored behavior
4025 status: always report ignored tracked directories
4028 git-completion.bash: silence "not a valid object" errors
4030 Eric S. Raymond (1):
4031 Remove the suggestion to use parsecvs, which is currently broken.
4034 git-for-each-ref.txt: 'raw' is a supported date format
4036 Jonathan Nieder (1):
4037 contrib/vim: simplify instructions for old vim support
4040 Start preparing for 1.8.1.2
4044 Prevent space after directories in tcsh completion
4046 Michael Haggerty (8):
4047 Introduce new static function real_path_internal()
4048 real_path_internal(): add comment explaining use of cwd
4049 Introduce new function real_path_if_valid()
4050 longest_ancestor_length(): use string_list_split()
4051 longest_ancestor_length(): take a string_list argument for prefixes
4052 longest_ancestor_length(): require prefix list entries to be normalized
4053 setup_git_directory_gently_1(): resolve symlinks in ceiling paths
4054 string_list_longest_prefix(): remove function
4056 Nguyễn Thái Ngọc Duy (1):
4057 attr: make it build with DEBUG_ATTR again
4059 Nickolai Zeldovich (1):
4060 git-send-email: treat field names as case-insensitively
4062 Peter Eisentraut (1):
4063 git-commit-tree(1): correct description of defaults
4066 archive-zip: write uncompressed size into header even with streaming
4067 t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
4068 t0024, t5000: use test_lazy_prereq for UNZIP
4069 t5000, t5003: move ZIP tests into their own script
4070 t5003: check if unzip supports symlinks
4072 Sebastian Staudt (1):
4073 config.txt: Document help.htmlpath config parameter
4076 Version v1.8.1.1; changes since v1.8.1:
4077 ---------------------------------------
4080 Use longer alias names in subdirectory tests
4083 api-allocation-growing.txt: encourage better variable naming
4085 Antoine Pelisse (1):
4086 merge: Honor prepare-commit-msg return code
4088 Christian Couder (1):
4089 Makefile: detect when PYTHON_PATH changes
4091 Jean-Noël AVILA (1):
4092 Add directory pattern matching to attributes
4095 run-command: drop silent_exec_failure arg from wait_or_whine
4096 launch_editor: refactor to use start/finish_command
4097 run-command: do not warn about child death from terminal
4098 launch_editor: propagate signals from editor to git
4099 completion: complete refs for "git commit -c"
4100 refs: do not use cached refs in repack_without_ref
4101 tests: turn on test-lint by default
4102 fix compilation with NO_PTHREADS
4103 run-command: encode signal death as a positive integer
4106 clone: support atomic operation with --separate-git-dir
4109 git-fast-import(1): remove duplicate '--done' option
4110 git-shortlog(1): document behaviour of zero-width wrap
4111 git-fast-import(1): combine documentation of --[no-]relative-marks
4112 git-fast-import(1): reorganise options
4114 Jonathan Nieder (6):
4115 config, gitignore: failure to access with ENOTDIR is ok
4116 config: treat user and xdg config permission problems as errors
4117 doc: advertise GIT_CONFIG_NOSYSTEM
4118 config: exit on error accessing any config file
4119 build: do not automatically reconfigure unless configure.ac changed
4120 docs: manpage XML depends on asciidoc.conf
4122 Junio C Hamano (20):
4123 apply.c:update_pre_post_images(): the preimage can be truncated
4124 format_commit_message(): simplify calls to logmsg_reencode()
4125 sh-setup: work around "unset IFS" bug in some shells
4126 fetch: ignore wildcarded refspecs that update local symbolic refs
4127 xmkstemp(): avoid showing truncated template more carefully
4128 t0200: "locale" may not exist
4129 t9502: do not assume GNU tar
4130 t4014: fix arguments to grep
4131 t3600: Avoid "cp -a", which is a GNUism
4132 t9020: use configured Python to run the test helper
4133 compat/fnmatch: update old-style definition to ANSI
4134 t9200: let "cvs init" create the test repository
4135 merge --no-edit: do not credit people involved in the side branch
4136 SubmittingPatches: who am I and who cares?
4137 SubmittingPatches: mention subsystems with dedicated repositories
4138 Documentation: full-ness of a bundle is significant for cloning
4139 SubmittingPatches: remove overlong checklist
4140 SubmittingPatches: give list and maintainer addresses
4144 Kirill Brilliantov (1):
4145 Documentation: correct example restore from bundle
4148 Makefile: add comment on CYGWIN_V15_WIN32API
4151 gitweb: Sort projects with undefined ages last
4154 configure.ac: fix pthreads detection on Mac OS X
4156 Michael Schubert (2):
4157 git-subtree: ignore git-subtree executable
4158 git-subtree: fix typo in manpage
4160 Michał Kiedrowicz (1):
4161 graph.c: infinite loop in git whatchanged --graph -m
4163 Nguyễn Thái Ngọc Duy (4):
4164 cache-tree: remove dead i-t-a code in verify_cache()
4165 cache-tree: replace "for" loops in update_one with "while" loops
4166 cache-tree: fix writing cache-tree when CE_REMOVE is present
4167 cache-tree: invalidate i-t-a paths after generating trees
4170 gitweb: fix error in sanitize when highlight is enabled
4173 launch_editor: ignore terminal signals while editor has control
4176 http.c: Avoid username prompt for certifcate credentials
4179 archive-tar: split long paths more carefully
4180 t1402: work around shell quoting issue on NetBSD
4182 Sebastian Schuberth (1):
4183 nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
4185 Steffen Prohaska (2):
4186 shortlog: fix wrapping lines of wraplen
4187 strbuf_add_wrapped*(): Remove unused return value
4189 Sven Strickroth (3):
4190 git-svn, perl/Git.pm: add central method for prompting passwords
4191 perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
4192 git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
4194 Thomas Ackermann (1):
4195 Remove Documentation/pt_BR/gittutorial.txt
4197 Torsten Bögershausen (2):
4198 t9810: Do not use sed -i
4199 t9020: which is not portable
4202 remote-hg: Fix biridectionality -> bidirectionality typos
4205 Version v1.8.1; changes since v1.8.1-rc3:
4206 -----------------------------------------
4209 git(1): show link to contributor summary page
4214 git-remote-helpers.txt: document invocation before input format
4216 Ramkumar Ramachandra (1):
4217 Documentation: move diff.wordRegex from config.txt to diff-config.txt
4219 Sebastian Leske (4):
4220 git-svn: Document branches with at-sign(@).
4221 git-svn: Recommend use of structure options.
4222 git-svn: Expand documentation for --follow-parent
4223 git-svn: Note about tags.
4226 make __git_ps1 accept a third parameter in pcmode
4228 Thomas Ackermann (1):
4229 Sort howto documents in howto-index.txt
4232 Version v1.8.1-rc3; changes since v1.8.1-rc2:
4233 ---------------------------------------------
4236 SubmittingPatches: add convention of prefixing commit messages
4237 Documentation: move support for old compilers to CodingGuidelines
4240 Documentation/git-checkout.txt: clarify usage
4241 Documentation/git-checkout.txt: document 70c9ac2 behavior
4244 .mailmap: match up some obvious names/emails
4245 .mailmap: fix broken entry for Martin Langhoff
4246 .mailmap: normalize emails for Jeff King
4247 .mailmap: normalize emails for Linus Torvalds
4248 contrib: update stats/mailmap script
4251 Documentation: don't link to example mail addresses
4254 fetch --tags: clarify documentation
4255 README: it does not matter who the current maintainer is
4256 t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
4257 Documentation: Describe "git diff <blob> <blob>" separately
4260 Nguyễn Thái Ngọc Duy (1):
4261 index-format.txt: clarify what is "invalid"
4263 Sebastian Leske (4):
4264 git-svn: Document branches with at-sign(@).
4265 git-svn: Recommend use of structure options.
4266 git-svn: Expand documentation for --follow-parent
4267 git-svn: Note about tags.
4269 Sitaram Chamarty (1):
4270 clarify -M without % symbol in diff-options
4272 Stefano Lattarini (1):
4273 README: Git is released under the GPLv2, not just "the GPL"
4275 Thomas Ackermann (3):
4276 Remove misleading date from api-index-skel.txt
4277 Remove duplicate entry in ./Documentation/Makefile
4278 Move ./technical/api-command.txt to ./howto/new-command.txt
4281 Version v1.8.1-rc2; changes since v1.8.1-rc1:
4282 ---------------------------------------------
4285 git-prompt: Document GIT_PS1_DESCRIBE_STYLE
4288 mingw: correct exit-code for SIGALRM's SIG_DFL
4289 mingw: make fgetc raise SIGINT if apropriate
4290 compat/terminal: factor out echo-disabling
4291 compat/terminal: separate input and output handles
4292 mingw: reuse tty-version of git_terminal_prompt
4293 mingw: get rid of getpass implementation
4294 mingw_rmdir: do not prompt for retry when non-empty
4297 remote-testsvn: fix unitialized variable
4300 git(1): remove a defunct link to "list of authors"
4302 git-prompt.sh: update PROMPT_COMMAND documentation
4303 git(1): show link to contributor summary page
4307 git.txt: add missing info about --git-dir command-line option
4310 Add file completion to tcsh git completion.
4313 Fix sizeof usage in get_permutations
4316 git-remote-helpers.txt: document invocation before input format
4317 git-remote-helpers.txt: document missing capabilities
4318 git-remote-helpers.txt: minor grammar fix
4319 git-remote-helpers.txt: rearrange description of capabilities
4320 git-remote-helpers.txt: clarify command <-> capability correspondences
4321 git-remote-helpers.txt: clarify options & ref list attributes
4323 Stefano Lattarini (1):
4324 Makefile: whitespace style fixes in macro definitions
4326 Sébastien Loriot (1):
4327 Documentation/git-stash.txt: add a missing verb
4329 Thomas Ackermann (1):
4330 Renumber list in api-command.txt
4333 Version v1.8.1-rc1; changes since v1.8.1-rc0:
4334 ---------------------------------------------
4337 l10n: Update git.pot (5 new, 1 removed messages)
4340 Update draft release notes to 1.8.0.2
4341 Documentation/diff-config: work around AsciiDoc misfortune
4345 document that statusHints affects git checkout
4348 l10n: Update Swedish translation (1979t0f0u)
4351 l10n: de.po: translate 825 new messages
4352 l10n: de.po: translate 22 new messages
4354 Ramkumar Ramachandra (4):
4355 t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
4356 t4041 (diff-submodule-option): parse digests sensibly
4357 t4041 (diff-submodule-option): rewrite add_file() routine
4358 t4041 (diff-submodule-option): modernize style
4361 l10n: vi.po: update to git-v1.8.0.1-347-gf94c3
4364 Version v1.8.1-rc0; changes since v1.8.0.3:
4365 -------------------------------------------
4368 Use character class for sed expression instead of \s
4371 usage.c: detect recursion in die routines and bail out immediately
4374 git-cvsimport: allow author-specific timezones
4377 vcs-svn: add fast_export_note to create notes
4380 emacs: make 'git-status' work with separate git dirs
4382 Eric S. Raymond (1):
4383 Documentation: how to add a new command
4385 Felipe Contreras (32):
4386 completion: add format-patch options to send-email
4387 Add new remote-hg transport helper
4388 remote-hg: add support for pushing
4389 remote-hg: add support for remote pushing
4390 remote-hg: add support to push URLs
4391 remote-hg: make sure the encoding is correct
4392 remote-hg: match hg merge behavior
4393 remote-hg: add support for hg-git compat mode
4394 remote-hg: add compat for hg-git author fixes
4395 remote-hg: fake bookmark when there's none
4396 remote-hg: add basic tests
4397 test-lib: avoid full path to store test results
4398 remote-hg: add bidirectional tests
4399 remote-hg: add tests to compare with hg-git
4400 remote-hg: add extra author test
4401 remote-hg: add option to not track branches
4402 remote-hg: the author email can be null
4403 remote-hg: fix compatibility with older versions of hg
4404 remote-hg: try the 'tip' if no checkout present
4405 remote-hg: avoid bad refs
4406 completion: add comment for test_completion()
4407 completion: standardize final space marker in tests
4408 completion: simplify tests using test_completion_long()
4409 completion: consolidate test_completion*() tests
4410 completion: refactor __gitcomp related tests
4411 completion: simplify __gitcomp() test helper
4412 completion: add new zsh completion
4413 completion: start moving to the new zsh completion
4414 send-email: avoid questions when user has an ident
4415 remote-hg: fix for files with spaces
4416 remote-hg: fix for older versions of python
4417 completion: fix warning for zsh
4419 Florian Achleitner (15):
4420 Implement a remote helper for svn in C
4421 Add git-remote-testsvn to Makefile
4422 Add svndump_init_fd to allow reading dumps from arbitrary FDs
4423 Add argv_array_detach and argv_array_free_detached
4424 Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
4425 Add documentation for the 'bidi-import' capability of remote-helpers
4426 When debug==1, start fast-import with "--stats" instead of "--quiet"
4427 remote-svn, vcs-svn: Enable fetching to private refs
4428 Allow reading svn dumps from files via file:// urls
4429 Create a note for every imported commit containing svn metadata
4430 remote-svn: Activate import/export-marks for fast-import
4431 remote-svn: add incremental import
4432 Add a svnrdump-simulator replaying a dump file for testing
4433 remote-svn: add marks-file regeneration
4434 Add a test script for remote-svn
4437 pager: drop "wait for output to run less" hack
4438 peel_ref: use faster deref_tag_noverify
4439 peel_ref: do not return a null sha1
4440 peel_ref: check object type before loading
4441 upload-pack: use peel_ref for ref advertisements
4442 remote-curl: do not call run_slot repeatedly
4443 http: do not set up curl auth after a 401
4444 strbuf: always return a non-NULL value from strbuf_detach
4445 status: add --long output format option
4446 git-sh-setup: refactor ident-parsing functions
4447 filter-branch: use git-sh-setup's ident parsing functions
4448 t1300: style updates
4449 t1300: remove redundant test
4450 t1300: test "git config --get-all" more thoroughly
4451 git-config: remove memory leak of key regexp
4452 git-config: fix regexp memory leaks on error conditions
4453 git-config: collect values instead of immediately printing
4454 git-config: do not complain about duplicate entries
4455 git-config: use git_config_with_options
4456 remote-curl: hoist gzip buffer size to top of post_rpc
4457 remote-curl: retry failed requests for auth even with gzip
4458 cvsimport: work around perl tzset issue
4459 test-lib: allow negation of prerequisites
4460 t7502: factor out autoident prerequisite
4461 ident: make user_ident_explicitly_given static
4462 ident: keep separate "explicit" flags for author and committer
4463 diff: rename "set" variable
4464 t: add tests for "git var"
4465 t9001: check send-email behavior with implicit sender
4466 status: respect advice.statusHints for ahead/behind advice
4469 diff: diff.context configuration gives default to -U
4472 submodule: teach rm to remove submodules unless they contain a git directory
4473 Teach "git submodule add" the --name option
4474 submodule add: Fail when .git/modules/<name> already exists unless forced
4475 submodule status: remove unused orig_* variables
4476 Teach rm to remove submodules when given with a trailing '/'
4479 l10n: Update git.pot (14 new, 3 removed messages)
4481 Joachim Schmitz (1):
4482 fix 'make test' for HP NonStop
4485 git symbolic-ref --delete $symref
4488 maybe_flush_or_die: move a too-loose Windows specific error
4490 Junio C Hamano (20):
4491 t4055: avoid use of sed 'a' command
4492 log --grep: accept --basic-regexp and --perl-regexp
4493 log: honor grep.* configuration
4494 coloured git-prompt: paint detached HEAD marker in red
4495 pretty: remove reencode_commit_message()
4496 format_note(): simplify API
4497 pretty: prepare notes message at a centralized place
4498 pretty_print_commit(): do not append notes message
4499 format-patch: append --signature after notes
4500 format-patch --notes: show notes after three-dashes
4501 Documentation: decribe format-patch --notes
4502 get_fetch_map(): tighten checks on dest refs
4503 format-patch: add a blank line between notes and diffstat
4505 Sixth batch for 1.8.1
4506 Update draft release notes for 1.8.1
4507 Update draft release notes to 1.8.1
4508 Update draft release notes to 1.8.1
4509 Update draft release notes to 1.8.1
4513 update-index/diff-index: use core.preloadindex to improve performance
4515 Krzysztof Mazur (10):
4516 git-send-email: introduce compose-encoding
4517 git-send-email: use compose-encoding for Subject
4518 git-send-email: skip RFC2047 quoting for ASCII subjects
4519 git-send-email: introduce quote_subject()
4520 git-send-email: add rfc2047 quoting for "=?"
4521 git-send-email: remove garbage after email address
4522 git-send-email: fix fallback code in extract_valid_address()
4523 git-send-email: remove invalid addresses earlier
4524 git-send-email: ask what to do with an invalid email address
4525 git-send-email: allow edit invalid email address
4528 tcsh-completion re-using git-completion.bash
4529 Support for git aliasing for tcsh completion
4532 Update cygwin.c for new mingw-64 win32 api headers
4533 USE CGYWIN_V15_WIN32API as macro to select api for cygwin
4536 docs: move submodule section
4538 Matthew Ogilvie (10):
4539 cvsserver t9400: add basic 'cvs log' test
4540 cvsserver: removed unused sha1Or-k mode from kopts_from_path
4541 cvsserver: add comments about database schema/usage
4542 cvsserver update: comment about how we shouldn't remove a user-modified file
4543 cvsserver: remove unused functions _headrev and gethistory
4544 cvsserver: clean up client request handler map comments
4545 cvsserver: split up long lines in req_{status,diff,log}
4546 cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
4547 cvsserver: cvs add: do not expand directory arguments
4548 cvsserver status: provide real sticky info
4551 status: add advice on how to push/pull to tracking branch
4553 Michael Haggerty (12):
4554 parse_dirstat_params(): use string_list to split comma-separated string
4555 strbuf_split_buf(): use ALLOC_GROW()
4556 strbuf_split_buf(): simplify iteration
4557 strbuf_split*(): rename "delim" parameter to "terminator"
4558 strbuf_split*(): document functions
4559 string_list: add a function string_list_remove_empty_items()
4560 Initialize sort_uniq_list using named constant
4561 combine_notes_cat_sort_uniq(): sort and dedup lines all at once
4562 notes: fix handling of colon-separated values
4563 string_list_add_refs_from_colon_sep(): use string_list_split()
4564 link_alt_odb_entries(): use string_list_split_in_place()
4565 link_alt_odb_entries(): take (char *, len) rather than two pointers
4567 Michael J Gruber (1):
4568 replace: parse revision argument for -d
4570 Nguyễn Thái Ngọc Duy (16):
4571 attr: avoid strlen() on every match
4572 attr: avoid searching for basename on every match
4573 exclude: stricten a length check in EXC_FLAG_ENDSWITH case
4574 exclude: split basename matching code into a separate function
4575 exclude: fix a bug in prefix compare optimization
4576 exclude: split pathname matching code into a separate function
4577 gitignore: make pattern parsing code a separate function
4578 attr: more matching optimizations from .gitignore
4579 tree-walk: use enum interesting instead of integer
4580 Move try_merge_command and checkout_fast_forward to libgit.a
4581 Move estimate_bisect_steps to libgit.a
4582 Move print_commit_list to libgit.a
4583 Move setup_diff_pager to libgit.a
4584 send-pack: move core code to libgit.a
4585 fetch-pack: remove global (static) configuration variable "args"
4586 fetch-pack: move core code to libgit.a
4589 Documentation: improve the example of overriding LESS via core.pager
4592 git p4: catch p4 describe errors
4593 git p4: handle servers without move support
4594 git p4: catch p4 errors when streaming file contents
4595 git p4 test: display unresolvable host error
4596 git p4: fix labelDetails typo in exception
4597 git p4: remove unneeded cmd initialization
4600 l10n: Update Swedish translation (1975t0f0u)
4603 t7407: Fix recursive submodule test
4604 Teach --recursive to submodule sync
4605 Add tests for submodule sync --recursive
4608 gitweb: make remote_heads config setting work
4611 Doc SubmittingPatches: Mention --notes option after "cover letter"
4612 Doc notes: Include the format-patch --notes option
4613 Doc format-patch: clarify --notes use case
4614 Doc User-Manual: Patch cover letter, three dashes, and --notes
4616 Ramkumar Ramachandra (4):
4617 remote-hg: add missing config for basic tests
4618 Documentation: move diff.wordRegex from config.txt to diff-config.txt
4619 diff: introduce diff.submodule configuration variable
4620 submodule: display summary header in bold
4622 Ramsay Allan Jones (2):
4623 builtin/config.c: Fix a sparse warning
4624 remote-curl.c: Fix a compiler warning
4627 completion: remove 'help' duplicate from porcelain commands
4630 Allow __git_ps1 to be used in PROMPT_COMMAND
4631 show color hints based on state of the git tree
4632 Fix up colored git-prompt
4635 submodule add: fix handling of --reference=<repo> option
4637 Stefano Lattarini (1):
4638 configure: fix some output message
4640 Torsten Bögershausen (1):
4641 Fix t9200 on case insensitive file systems
4644 l10n: vi.po: update to git-v1.7.12-437-g1084f
4645 l10n: vi.po: Update follow git-v1.8.0-273-g2d242
4648 Version v1.8.0.3; changes since v1.8.0.2:
4649 -----------------------------------------
4652 SubmittingPatches: add convention of prefixing commit messages
4653 Documentation: move support for old compilers to CodingGuidelines
4656 git-prompt: Document GIT_PS1_DESCRIBE_STYLE
4659 Documentation/git-checkout.txt: clarify usage
4660 Documentation/git-checkout.txt: document 70c9ac2 behavior
4662 Gunnlaugur Þór Briem (1):
4663 Document git-svn fetch --log-window-size parameter
4666 pickaxe: hoist empty needle check
4667 pickaxe: use textconv for -S counting
4668 .mailmap: match up some obvious names/emails
4669 .mailmap: fix broken entry for Martin Langhoff
4670 .mailmap: normalize emails for Jeff King
4671 .mailmap: normalize emails for Linus Torvalds
4672 contrib: update stats/mailmap script
4675 Documentation: don't link to example mail addresses
4678 fetch --tags: clarify documentation
4679 README: it does not matter who the current maintainer is
4680 t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
4681 Documentation: Describe "git diff <blob> <blob>" separately
4682 git(1): show link to contributor summary page
4685 Krzysztof Mazur (1):
4686 doc: git-reset: make "<mode>" optional
4689 git.txt: add missing info about --git-dir command-line option
4692 Fix sizeof usage in get_permutations
4695 git-remote-helpers.txt: document invocation before input format
4697 Nguyễn Thái Ngọc Duy (1):
4698 index-format.txt: clarify what is "invalid"
4700 Ramkumar Ramachandra (1):
4701 Documentation: move diff.wordRegex from config.txt to diff-config.txt
4703 Sebastian Leske (4):
4704 git-svn: Document branches with at-sign(@).
4705 git-svn: Recommend use of structure options.
4706 git-svn: Expand documentation for --follow-parent
4707 git-svn: Note about tags.
4709 Sitaram Chamarty (1):
4710 clarify -M without % symbol in diff-options
4712 Stefano Lattarini (1):
4713 README: Git is released under the GPLv2, not just "the GPL"
4715 Thomas Ackermann (8):
4716 Split over-long synopsis in git-fetch-pack.txt into several lines
4717 Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
4718 Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
4719 Documentation/technical: convert plain text files to asciidoc
4720 Documentation/howto: convert plain text files to asciidoc
4721 Documentation: build html for all files in technical and howto
4722 Remove misleading date from api-index-skel.txt
4723 Sort howto documents in howto-index.txt
4726 Add -S, --gpg-sign option to manpage of "git commit"
4729 Version v1.8.0.2; changes since v1.8.0.1:
4730 -----------------------------------------
4732 Antoine Pelisse (1):
4733 Fix typo in remote set-head usage
4735 Eric S. Raymond (1):
4736 doc/fast-import: clarify how content states are built
4739 t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
4740 Fix failure to delete a packed ref through a symref
4742 Junio C Hamano (13):
4743 reencode_string(): introduce and use same_encoding()
4744 test: add failing tests for "diff --stat" to t4049
4745 diff --stat: status of unmodified pair in diff-q is not zero
4746 diff --stat: use "file" temporary variable to refer to data->files[i]
4747 diff --stat: move the "total count" logic to the last loop
4748 diff --stat: do not count "unmerged" entries
4749 diff --shortstat: do not count "unmerged" entries
4750 Documentation/git-push.txt: clarify the "push from satellite" workflow
4751 Start preparing for 1.8.0.2
4752 t4049: refocus tests
4753 Update draft release notes to 1.8.0.2
4754 git(1): remove a defunct link to "list of authors"
4758 Fix "git diff --stat" for interesting - but empty - file changes
4760 Mark Szepieniec (1):
4761 Documentation: improve phrasing in git-push.txt
4764 git-remote-mediawiki: escape ", \, and LF in file names
4765 git-fast-import.txt: improve documentation for quoted paths
4767 Nguyễn Thái Ngọc Duy (1):
4768 compat/fnmatch: fix off-by-one character class's length check
4771 Makefile: hide stderr of curl-config test
4774 git p4: RCS expansion should not span newlines
4777 completion: add options --single-branch and --branch to "git clone"
4779 Richard Hubbell (1):
4780 gitweb.perl: fix %highlight_ext mappings
4782 Sébastien Loriot (1):
4783 Documentation/git-stash.txt: add a missing verb
4786 git-submodule: wrap branch option with "<>" in usage strings.
4789 Version v1.8.0.1; changes since v1.8.0:
4790 ---------------------------------------
4793 commit: fixup misplacement of --no-post-rewrite description
4796 Remove the hard coded length limit on variable names in config files
4798 Carlos Martín Nieto (1):
4799 config: don't segfault when given --path with a missing value
4802 mergetools/p4merge: Handle "/dev/null"
4804 Jan H. Schönherr (7):
4805 utf8: fix off-by-one wrapping of text
4806 format-patch: do not wrap non-rfc2047 headers too early
4807 format-patch: do not wrap rfc2047 encoded headers too late
4808 format-patch: introduce helper function last_line_length()
4809 format-patch: make rfc2047 encoding more strict
4810 format-patch: fix rfc2047 address encoding with respect to rfc822 specials
4811 format-patch tests: check quoting/encoding in To: and Cc: headers
4814 diff_grep: use textconv buffers for add/deleted files
4815 gitweb: escape html in rss title
4816 checkout: print a message when switching unborn branches
4819 builtin/grep.c: make configuration callback more reusable
4820 grep: move the configuration parsing logic to grep.[ch]
4821 grep: move pattern-type bits support to top-level grep.[ch]
4822 revisions: initialize revs->grep_filter using grep_init()
4823 log --grep: use the same helper to set -E/-F options as "git grep"
4824 test-lib: Fix say_color () not to interpret \a\b\c in the message
4825 Start preparing for 1.8.0.1
4826 Further preparation for 1.8.0.1
4830 Completion must sort before using uniq
4833 Documentation: remote tracking branch -> remote-tracking branch
4834 Document 'git commit --no-edit' explicitly
4836 Michael J Gruber (1):
4837 push/pull: adjust missing upstream help text to changed interface
4839 Nguyễn Thái Ngọc Duy (1):
4840 grep: stop looking at random places for .gitattributes
4843 git-pull: Avoid merge-base on detached head
4846 Doc repository-layout: Show refs/replace
4849 refs: lock symref that is to be deleted, not its target
4850 branch: factor out check_branch_commit()
4851 branch: factor out delete_branch_config()
4852 branch: delete symref branch, not its target
4853 branch: skip commit checks when deleting symref branches
4854 branch: show targets of deleted symrefs, not sha1s
4856 Romain Francoise (1):
4857 mailmap: avoid out-of-bounds memory access
4860 Fix potential hang in https handshake
4863 Version v1.8.0; changes since v1.8.0-rc3:
4864 -----------------------------------------
4867 git-gui: Detect full path when parsing arguments
4868 git-gui: Don't prepend the prefix if value looks like a full path
4871 git-gui: Fix a loose/lose mistake
4872 git-gui: remove .git/CHERRY_PICK_HEAD after committing
4874 Benjamin Kerensa (1):
4875 git-gui: fix a typo in po/ files
4877 Clemens Buchacher (1):
4878 git-gui: fix git-gui crash due to uninitialized variable
4881 git-gui: open console when using --trace on windows
4886 Marcus Karlsson (1):
4887 git-gui: Use PWD if it exists on Mac OS X
4890 git-gui: preserve commit messages in utf-8
4894 git-gui: de.po: consistently add untranslated hook names within braces
4895 git-gui: de.po: translate "bare" as "bloß"
4896 git-gui: de.po: translate "remote" as "extern"
4898 Vitaly _Vi Shukela (1):
4899 git-gui: Fix semi-working shortcuts for unstage and revert
4902 Version v1.8.0-rc3; changes since v1.8.0-rc2:
4903 ---------------------------------------------
4905 Dylan Alex Simon (1):
4906 gitweb.cgi: fix "comitter_tz" typo in feed
4909 http: fix segfault in handle_curl_result
4912 l10n: Update git.pot (3 new, 6 removed messages)
4915 Update draft release notes to 1.8.0
4920 l10n: Update Swedish translation (1964t0f0u)
4923 Fix spelling error in post-receive-email hook
4925 Thomas Ackermann (1):
4926 Documentation/RelNotes: remove "updated up to this revision" markers
4929 l10n: vi.po: update translation upto cc76011
4930 l10n: vi.po: update from v1.8.0-rc2-4-g42e55
4933 Version v1.8.0-rc2; changes since v1.8.0-rc1:
4934 ---------------------------------------------
4937 tests: "cp -a" is a GNUism
4939 Jonathan Nieder (2):
4940 git svn: work around SVN 1.7 mishandling of svn:special changes
4941 svn test: escape peg revision separator using empty peg rev
4944 gitcli: parse-options lets you omit tail of long options
4947 Nguyễn Thái Ngọc Duy (2):
4948 gitignore.txt: suggestions how to get literal # or ! at the beginning
4949 attr: a note about the order of .gitattributes lookup
4951 Ramkumar Ramachandra (1):
4952 Git url doc: mark ftp/ftps as read-only and deprecate them
4954 Ramsay Allan Jones (1):
4955 MALLOC_CHECK: Allow checking to be disabled from config.mak
4958 l10n: de.po: fix a few minor typos
4961 configure.ac: Add missing comma to CC_LD_DYNPATH
4964 Version v1.8.0-rc1; changes since v1.8.0-rc0:
4965 ---------------------------------------------
4968 Make git-svn branch patterns match complete URL
4971 git-svn: use path accessor for Git::SVN objects
4973 Jonathan Nieder (2):
4974 Git::SVN: rename private path field
4975 git-svn: keep leading slash when canonicalizing paths (fallback case)
4978 log --grep-reflog: reject the option without -g
4979 Start preparing for 1.7.12.3
4980 t1450: the order the objects are checked is undefined
4981 Update draft release notes to 1.8.0
4982 paint_down_to_common(): parse commit before relying on its timestamp
4987 mailinfo: don't require "text" mime type for attachments
4989 Michael J Gruber (1):
4990 RelNotes/1.8.0: various typo and style fixes
4992 Nguyễn Thái Ngọc Duy (3):
4993 grep: prepare for new header field filter
4994 revision: add --grep-reflog to filter commits by reflog messages
4995 revision: make --grep search in notes too if shown
4998 l10n: Fix to Swedish translation
5000 Ramkumar Ramachandra (1):
5001 Documentation: mention `push.default` in git-push.txt
5004 t9164: Add missing quotes in test
5007 git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
5008 git-svn.perl: keep processing all commits in parents_exclude
5011 silence git gc --auto --quiet output
5014 Version v1.8.0-rc0; changes since v1.7.12.4:
5015 --------------------------------------------
5018 Add userdiff patterns for Ada
5021 rebase -i: Refactor help messages for todo file
5022 rebase -i: Teach "--edit-todo" action
5023 rebase -i: Add tests for "--edit-todo"
5026 gitk: Fix GIT_TRACE issues
5028 Carlos Martín Nieto (4):
5029 branch: introduce --set-upstream-to
5030 branch: add --unset-upstream option
5031 branch: deprecate --set-upstream and show help if we detect possible mistaken use
5032 completion: add --set-upstream-to and --unset-upstream
5035 cherry-pick: add --allow-empty-message option
5038 difftool: Simplify print_tool_help()
5039 difftool: Eliminate global variables
5040 difftool: Move option values into a hash
5041 difftool: Call the temp directory "git-difftool"
5042 difftool: Use symlinks when diffing against the worktree
5043 difftool: Handle finding mergetools/ in a path with spaces
5044 difftool: Check all return codes from compare()
5045 difftool: Wrap long lines for readability
5046 difftool: Handle compare() returning -1
5047 difftool: Disable --symlinks on cygwin
5048 mergetool,difftool: Document --tool-help consistently
5049 mergetool--lib: Allow custom commands to override built-ins
5052 Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
5055 contrib: add win32 credential-helper
5058 grep: add a grep.patternType configuration setting
5061 remote-curl: rename is_http variable
5062 remote-curl: let users turn off smart http
5063 t9902: add a few basic completion tests
5064 t9902: add completion tests for "odd" filenames
5067 Fix tests under GETTEXT_POISON on relative dates
5068 Fix tests under GETTEXT_POISON on git-stash
5069 Fix tests under GETTEXT_POISON on diffstat
5070 Fix tests under GETTEXT_POISON on git-apply
5071 Fix tests under GETTEXT_POISON on pack-object
5072 Fix tests under GETTEXT_POISON on git-remote
5073 Fix tests under GETTEXT_POISON on parseopt
5074 l10n: Update git.pot (2 new, 4 removed messages)
5075 l10n: zh_CN.po: translate 2 new messages
5076 l10n: Update git.pot (825 new, 24 removed messages)
5077 l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
5079 Joachim Schmitz (8):
5080 compat: some mkdir() do not like a slash at the end
5081 Add a no-op setitimer() wrapper
5082 Document MKDIR_WO_TRAILING_SLASH in Makefile
5083 make poll available for other platforms lacking it
5084 fix some win32 specific dependencies in poll.c
5085 poll() exits too early with EFAULT if 1st arg is NULL
5086 make poll() work on platforms that can't recv() on a non-socket
5090 t0060: split absolute path test in two to exercise some of it on Windows
5091 rebase -i: fix misleading error message after 'exec no-such' instruction
5092 rebase -i: suggest using --edit-todo to fix an unknown instruction
5094 Junio C Hamano (42):
5095 daemon: --access-hook option
5096 Kick off cycle towards 1.8.0
5097 First half of the second batch for 1.8.0
5098 in_merge_bases(): support only one "other" commit
5099 receive-pack: use in_merge_bases() for fast-forward check
5100 http-push: use in_merge_bases() for fast-forward check
5101 Latter half of the second batch for 1.8.0
5102 merge_bases_many(): split out the logic to paint history
5103 in_merge_bases(): use paint_down_to_common()
5104 get_merge_bases_many(): walk from many tips in parallel
5105 merge-base: "--is-ancestor A B"
5106 reduce_heads(): reimplement on top of remove_redundant()
5107 The third batch for 1.8.0
5108 Update mailmap for a handful of folks
5109 The fourth batch for 1.8.0
5110 Cull items fixed in maintenance branches
5111 First half of the fifth batch for 1.8.0
5112 Second half of the fifth batch for 1.8.0
5113 Start merging the sixth batch for 1.8.0
5114 The sixth batch for 1.8.0
5115 Draft release notes to 1.8.0
5116 builtin/notes.c: mark file-scope private symbols as static
5117 commit.c: mark a file-scope private symbol as static
5118 diff.c: mark a private file-scope symbol as static
5119 graph.c: mark private file-scope symbols as static
5120 rerere.c: mark private file-scope symbols as static
5121 notes.c: mark a private file-scope symbol as static
5122 symlinks.c: mark private file-scope symbols as static
5123 sha1-array.c: mark a private file-scope symbol as static
5124 strbuf.c: mark a private file-scope symbol as static
5125 read-cache.c: mark a private file-scope symbol as static
5126 wt-status.c: mark a private file-scope symbol as static
5127 trace.c: mark a private file-scope symbol as static
5128 ident.c: mark private file-scope symbols as static
5129 sequencer.c: mark a private file-scope symbol as static
5130 The seventh batch for 1.8.0
5131 MALLOC_CHECK: various clean-ups
5132 Revert "archive-zip: support UTF-8 paths"
5133 Update draft release notes to 1.8.0
5134 Update draft release notes to 1.8.0
5135 Update draft release notes to 1.8.0
5139 cvsimport: strip all inappropriate tag strings
5142 commit/commit-tree: correct latin1 to utf-8
5144 Martin von Zweigbergk (4):
5145 remove unnecessary parameter from get_patch_ids()
5146 cherry: don't set ignored rev_info options
5147 cherry: remove redundant check for merge commit
5148 rebase usage: subcommands can not be combined with -i
5151 push: start warning upcoming default change for push.default
5153 Michael G. Schwern (20):
5154 Git::SVN: use accessors internally for path
5155 Git::SVN: use accessor for URLs internally
5156 Git::SVN::Ra: use accessor for URLs
5157 use Git::SVN->path accessor globally
5158 use Git::SVN{,::RA}->url accessor globally
5159 git-svn: move canonicalization to Git::SVN::Utils
5160 git-svn: use SVN 1.7 to canonicalize when possible
5161 git-svn: factor out _collapse_dotdot function
5162 git-svn: add join_paths() to safely concatenate paths
5163 Git::SVN::Utils: remove irrelevant comment
5164 git-svn: path canonicalization uses SVN API
5165 Git::SVN{,::Ra}: canonicalize earlier
5166 t9118: workaround inconsistency between SVN versions
5168 git-svn: attempt to mimic SVN 1.7 URL canonicalization
5169 git-svn: replace URL escapes with canonicalization
5170 git-svn: canonicalize earlier
5171 git-svn: introduce add_path_to_url function
5172 git-svn: canonicalize newly-minted URLs
5173 git-svn: remove ad-hoc canonicalizations
5175 Michael Haggerty (29):
5176 t0060: move tests of real_path() from t0000 to here
5177 t0060: verify that absolute_path() fails if passed the empty string
5178 absolute_path(): reject the empty string
5179 t0060: verify that real_path() fails if passed the empty string
5180 real_path(): reject the empty string
5181 t0060: verify that real_path() works correctly with absolute paths
5182 real_path(): properly handle nonexistent top-level paths
5183 t0060: verify that real_path() removes extra slashes
5184 string_list: add function string_list_append_nodup()
5185 string_list: add two new functions for splitting strings
5186 string_list: add a new function, filter_string_list()
5187 string_list: add a new function, string_list_remove_duplicates()
5188 string_list: add a function string_list_longest_prefix()
5189 api-string-list.txt: initialize the string_list the easy way
5190 t5500: add tests of error output for missing refs
5191 t5500: add tests of fetch-pack --all --depth=N $URL $REF
5192 Rename static function fetch_pack() to http_fetch_pack()
5193 fetch_pack(): reindent function decl and defn
5194 Change fetch_pack() and friends to take string_list arguments
5195 filter_refs(): do not check the same sought_pos twice
5196 fetch_pack(): update sought->nr to reflect number of unique entries
5197 filter_refs(): delete matched refs from sought list
5198 filter_refs(): build refs list as we go
5199 filter_refs(): simplify logic
5200 cmd_fetch_pack(): return early if finish_connect() fails
5201 fetch-pack: report missing refs even if no existing refs were received
5202 cmd_fetch_pack(): simplify computation of return value
5203 fetch-pack: eliminate spurious error messages
5204 string_list API: document what "sorted" means
5206 Michael J Gruber (1):
5207 completion: complete branch name for "branch --set-upstream-to="
5210 cherry-pick: don't forget -s on failure
5212 Nguyễn Thái Ngọc Duy (74):
5213 i18n: mark "style" in OPT_COLUMN() for translation
5214 i18n: archive: mark parseopt strings for translation
5215 i18n: bisect--helper: mark parseopt strings for translation
5216 i18n: add: mark parseopt strings for translation
5217 i18n: blame: mark parseopt strings for translation
5218 i18n: branch: mark parseopt strings for translation
5219 i18n: cat-file: mark parseopt strings for translation
5220 i18n: check-attr: mark parseopt strings for translation
5221 i18n: checkout-index: mark parseopt strings for translation
5222 i18n: checkout: mark parseopt strings for translation
5223 i18n: cherry: mark parseopt strings for translation
5224 i18n: clean: mark parseopt strings for translation
5225 i18n: clone: mark parseopt strings for translation
5226 i18n: column: mark parseopt strings for translation
5227 i18n: commit: mark parseopt strings for translation
5228 i18n: count-objects: mark parseopt strings for translation
5229 i18n: config: mark parseopt strings for translation
5230 i18n: describe: mark parseopt strings for translation
5231 i18n: fast-export: mark parseopt strings for translation
5232 i18n: fetch: mark parseopt strings for translation
5233 i18n: fmt-merge-msg: mark parseopt strings for translation
5234 i18n: for-each-ref: mark parseopt strings for translation
5235 i18n: format-patch: mark parseopt strings for translation
5236 i18n: fsck: mark parseopt strings for translation
5237 i18n: gc: mark parseopt strings for translation
5238 i18n: grep: mark parseopt strings for translation
5239 i18n: hash-object: mark parseopt strings for translation
5240 i18n: help: mark parseopt strings for translation
5241 i18n: init-db: mark parseopt strings for translation
5242 i18n: log: mark parseopt strings for translation
5243 i18n: ls-files: mark parseopt strings for translation
5244 i18n: ls-tree: mark parseopt strings for translation
5245 i18n: merge-base: mark parseopt strings for translation
5246 i18n: merge-file: mark parseopt strings for translation
5247 i18n: merge: mark parseopt strings for translation
5248 i18n: mktree: mark parseopt strings for translation
5249 i18n: mv: mark parseopt strings for translation
5250 i18n: name-rev: mark parseopt strings for translation
5251 i18n: notes: mark parseopt strings for translation
5252 i18n: pack-objects: mark parseopt strings for translation
5253 i18n: pack-refs: mark parseopt strings for translation
5254 i18n: prune-packed: mark parseopt strings for translation
5255 i18n: prune: mark parseopt strings for translation
5256 i18n: push: mark parseopt strings for translation
5257 i18n: read-tree: mark parseopt strings for translation
5258 i18n: remote: mark parseopt strings for translation
5259 i18n: replace: mark parseopt strings for translation
5260 i18n: status: mark parseopt strings for translation
5261 i18n: rerere: mark parseopt strings for translation
5262 i18n: reset: mark parseopt strings for translation
5263 i18n: rev-parse: mark parseopt strings for translation
5264 i18n: revert, cherry-pick: mark parseopt strings for translation
5265 i18n: rm: mark parseopt strings for translation
5266 i18n: shortlog: mark parseopt strings for translation
5267 am: quote string for translation before passing to eval_gettextln
5268 i18n: show-branch: mark parseopt strings for translation
5269 i18n: show-ref: mark parseopt strings for translation
5270 i18n: symbolic-ref: mark parseopt strings for translation
5271 i18n: tag: mark parseopt strings for translation
5272 i18n: update-index: mark parseopt strings for translation
5273 i18n: update-ref: mark parseopt strings for translation
5274 i18n: update-server-info: mark parseopt strings for translation
5275 i18n: verify-pack: mark parseopt strings for translation
5276 i18n: verify-tag: mark parseopt strings for translation
5277 i18n: write-tree: mark parseopt strings for translation
5278 Reduce translations by using same terminologies
5279 Use imperative form in help usage to describe an action
5280 branch -v: align even when branch names are in UTF-8
5281 checkout: pass "struct checkout_opts *" as const pointer
5282 checkout: move more parameters to struct checkout_opts
5283 i18n: mark more index-pack strings for translation
5284 status: remove i18n legos
5285 checkout: reorder option handling
5286 fetch: align per-ref summary report in UTF-8 locales
5289 git p4 test: move client_view() function to library
5290 git p4 test: add broken --use-client-spec --detect-branches tests
5291 git p4: set self.branchPrefixes in initialization
5292 git p4: do wildcard decoding in stripRepoPath
5293 git p4: make branch detection work with --use-client-spec
5294 git p4 test: remove bash-ism of combined export/assignment
5295 git p4: gracefully fail if some commits could not be applied
5296 git p4: remove submit failure options [a]pply and [w]rite
5297 git p4: move conflict prompt into run, add [q]uit input
5298 git p4: standardize submit cancel due to unchanged template
5299 git p4: test clean-up after failed submit, fix added files
5300 git p4: rearrange submit template construction
5301 git p4: revert deleted files after submit cancel
5302 git p4: accept -v for --verbose
5303 git p4: add submit --dry-run option
5304 git p4: add submit --prepare-p4-only option
5305 git-p4: add submit --conflict option and config varaiable
5308 l10n: Update Swedish translation (1166t0f0u)
5309 Update Swedish translation (1967t0f0u)
5310 l10n: Fixes to Swedish translation
5312 Philipp A. Hartmann (1):
5313 contrib: add credential helper for GnomeKeyring
5316 l10n: de.po: translate 2 new messages
5318 Ramsay Allan Jones (12):
5319 t3300-*.sh: Fix a TAP parse error
5320 t3902-*.sh: Skip all tests rather than each test
5321 t4016-*.sh: Skip all tests rather than each test
5322 test-lib.sh: Fix some shell coding style violations
5323 test-lib.sh: Add check for invalid use of 'skip_all' facility
5324 test-lib.sh: Suppress the "passed all ..." message if no tests run
5325 path.c: Remove the 'git_' prefix from a file scope function
5326 path.c: Don't discard the return value of vsnpath()
5327 path.c: Use vsnpath() in the implementation of git_path()
5328 Call git_pathdup() rather than xstrdup(git_path("..."))
5329 Call mkpathdup() rather than xstrdup(mkpath(...))
5330 test-string-list.c: Fix some sparse warnings
5333 archive-zip: support UTF-8 paths
5334 archive-zip: support UTF-8 paths
5335 archive-zip: write extended timestamp
5336 MALLOC_CHECK: enable it, unless disabled explicitly
5339 difftool: silence warning
5341 Sebastian Schuberth (1):
5342 Add Code Compare v2.80.4 as a merge / diff tool for Windows
5344 Stefano Lattarini (2):
5345 build: improve GIT_CONF_SUBST signature
5346 build: don't duplicate substitution of make variables
5349 gettext: do not translate empty string
5350 in_merge_bases(): omit unnecessary redundant common ancestor reduction
5353 l10n: vi.po & TEAMS: review Vietnamese translation
5354 l10n: vi.po: update to v1.7.12-146-g16d26
5357 Version v1.7.12.4; changes since v1.7.12.3:
5358 -------------------------------------------
5361 tests: "cp -a" is a GNUism
5364 Documentation/Makefile: Allow custom XMLTO binary
5366 Dylan Alex Simon (1):
5367 gitweb.cgi: fix "comitter_tz" typo in feed
5370 http: fix segfault in handle_curl_result
5373 merge: teach -Xours/-Xtheirs to binary ll-merge driver
5374 attr: "binary" attribute should choose built-in "binary" merge driver
5375 ll-merge: warn about inability to merge binary files only when we can't
5376 t1450: the order the objects are checked is undefined
5377 gitcli: parse-options lets you omit tail of long options
5380 Nguyễn Thái Ngọc Duy (2):
5381 gitignore.txt: suggestions how to get literal # or ! at the beginning
5382 attr: a note about the order of .gitattributes lookup
5385 Doc: shallow clone deepens _to_ new depth
5386 Doc: separate gitignore pattern sources
5387 Doc add: link gitignore
5388 Doc clean: add See Also link
5389 Doc branch: show -vv option and alternative
5391 Ramkumar Ramachandra (3):
5392 t/test-lib: make sure Git has already been built
5393 test-lib: use $SHELL_PATH, not $SHELL
5394 Git url doc: mark ftp/ftps as read-only and deprecate them
5397 Fix spelling error in post-receive-email hook
5400 l10n: de.po: fix a few minor typos
5403 Version v1.7.12.3; changes since v1.7.12.2:
5404 -------------------------------------------
5407 receive-pack: redirect unpack-objects stdout to /dev/null
5408 receive-pack: send pack-processing stderr over sideband
5409 receive-pack: drop "n/a" on unpacker errors
5412 git blame: document that it always follows origin across whole-file renames
5413 Start preparing for 1.7.12.3
5417 mailinfo: don't require "text" mime type for attachments
5420 commit: pay attention to submodule.$name.ignore in .gitmodules
5423 l10n: Fix to Swedish translation
5426 clone --single: limit the fetch refspec to fetched branch
5428 Ramkumar Ramachandra (1):
5429 submodule: if $command was not matched, don't parse other args
5431 Shawn O. Pearce (2):
5432 Revert "retry request without query when info/refs?query fails"
5433 Enable info/refs gzip decompression in HTTP client
5436 Version v1.7.12.2; changes since v1.7.12.1:
5437 -------------------------------------------
5440 fetch --all: pass --tags/--no-tags through to each remote
5443 run-command.c: fix broken list iteration in clear_child_for_cleanup
5445 Felipe Contreras (1):
5446 completion: fix shell expansion of items
5449 argv-array: add pop function
5450 argv-array: fix bogus cast when freeing array
5451 fetch: use argv_array instead of hand-building arrays
5452 Revert "completion: fix shell expansion of items"
5455 submodule: use argv_array instead of hand-building arrays
5458 Documentation: describe subject more precisely
5460 Jonathan "Duke" Leto (1):
5461 Improve the description of GIT_PS1_SHOWUPSTREAM
5463 Junio C Hamano (11):
5464 mailinfo: strip "RE: " prefix
5465 blame $path: avoid getting fooled by case insensitive filesystems
5466 blame: allow "blame file" in the middle of a conflicted merge
5467 grep: teach --debug option to dump the parse tree
5468 log --grep/--author: honor --all-match honored for multiple --grep patterns
5469 log: document use of multiple commit limiting options
5470 grep.c: mark private file-scope symbols as static
5471 mailinfo: do not concatenate charset= attribute values from mime headers
5472 grep.c: make two symbols really file-scope static this time
5473 Start preparation for 1.7.12.2
5476 Michael J Gruber (6):
5477 grep: show --debug output only once
5478 t7810-grep: bring log --grep tests in common form
5479 t7810-grep: test multiple --grep with and without --all-match
5480 t7810-grep: test multiple --author with --all-match
5481 t7810-grep: test interaction of multiple --grep and --author options
5482 t7810-grep: test --all-match with multiple --grep and --author options
5484 Nguyễn Thái Ngọc Duy (3):
5485 remote: prefer subcommand name 'remove' to 'rm'
5486 doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
5487 Revert diffstat back to English
5490 l10n: de.po: correct translation of a 'rebase' message
5493 ls-remote: document the '--get-url' option
5496 Documentation: Document signature showing options
5499 l10n: Unify the translation for '(un)expected'
5500 l10n: Improve many translation for zh_CN
5503 Version v1.7.12.1; changes since v1.7.12:
5504 -----------------------------------------
5507 Fix '\ No newline...' annotation in rewrite diffs
5510 Add missing -z to git check-attr usage text for consistency with man page
5513 Documentation/git-filter-branch: Move note about effect of removing commits
5516 t/t5400: demonstrate breakage caused by informational message from prune
5517 prune.c: only print informational message in show_only or verbose mode
5520 gitk: Teach "Reread references" to reload tags
5521 gitk: Rename 'tagcontents' to 'cached_tagcontent'
5523 Eric S. Raymond (4):
5524 fast-import: document the --done option
5525 contrib/ciabot: Get ciabot configuration from git variables
5526 Improved documentation for the ciabot scripts.
5527 Make the ciabot scripts completely self-configuring in the normal case.
5529 Felipe Contreras (1):
5530 gitk: Avoid Meta1-F5
5533 Let submodule command exit with error status if path does not exist
5534 Documentation/CodingGuidelines: spell out more shell guidelines
5537 gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
5540 diff: do not use null sha1 as a sentinel value
5541 do not write null sha1s to on-disk index
5542 fsck: detect null sha1 in tree entries
5543 include agent identifier in capability string
5544 docs: monospace listings in docbook output
5545 check-docs: mention gitweb specially
5546 check-docs: update non-command documentation list
5547 command-list: add git-sh-i18n
5548 command-list: mention git-credential-* helpers
5549 check-docs: factor out command-list
5550 check-docs: list git-gui as a command
5551 check-docs: drop git-help special-case
5552 check-docs: get documented command list from Makefile
5553 send-pack: fix capability-sending logic
5554 do not send client agent unless server does first
5555 parse_feature_request: make it easier to see feature values
5556 fetch-pack: mention server version with verbose output
5557 config: warn on inaccessible files
5558 gitignore: report access errors of exclude files
5559 attr: warn on inaccessible attribute files
5560 t5550: put auth-required repo in auth/dumb
5561 t5550: factor out http auth setup
5562 t/lib-httpd: only route auth/dumb to dumb repos
5563 t/lib-httpd: recognize */smart/* repos as smart-http
5564 t: test basic smart-http authentication
5565 t: test http access to "half-auth" repositories
5566 http: factor out http error code handling
5567 http: prompt for credentials on failed POST
5568 log: fix --quiet synonym for -s
5570 Joachim Schmitz (2):
5571 http.c: don't use curl_easy_strerror prior to curl-7.12.0
5572 sha1_file.c: introduce get_max_fd_limit() helper
5574 Junio C Hamano (34):
5575 test: rename $satisfied to $satisfied_prereq
5576 test: allow prerequisite to be evaluated lazily
5577 config: "git config baa" should exit with status 1
5578 t7406: fix misleading "rev-parse --max-count=1 HEAD"
5579 sane_execvp(): ignore non-directory on $PATH
5580 Documentation: do not mention .git/refs/* directories
5581 receive-pack: do not leak output from auto-gc to standard output
5582 sh-setup: protect from exported IFS
5583 fetch-pack: do not ask for unadvertised capabilities
5584 send-email: validate & reconfirm interactive responses
5585 rev-list docs: clarify --topo-order description
5586 gitcli: describe abbreviation of long options
5587 Documentation: update the introductory section
5588 git-config doc: unconfuse an example
5589 precompose-utf8: do not call checks for non-ascii "utf8"
5590 warn_on_inaccessible(): a helper to warn on inaccessible paths
5591 specifying ranges: we did not mean to make ".." an empty set
5592 mergetool: style fixes
5593 Prepare for 1.7.11.6
5594 apply: compute patch->def_name correctly under -p0
5595 doc: "git checkout -b/-B/--orphan" always takes a branch name
5596 split_ident_line(): make best effort when parsing author/committer line
5597 Document file-glob for "git checkout -- '*.c'"
5598 gitcli: formatting fix
5599 gitcli: contrast wildcard given to shell and to git
5601 Start preparing for 1.7.12.1
5603 Further merging down for 1.7.12.1
5604 Further merging in preparation for 1.7.12.1
5605 attr: failure to open a .gitattributes file is OK with ENOTDIR
5607 Draft release notes to 1.7.12.1
5611 t6300: test sort with multiple keys
5612 for-each-ref: Fix sort with multiple keys
5614 Martin von Zweigbergk (4):
5615 add tests for 'git rebase --keep-empty'
5616 teach log --no-walk=unsorted, which avoids sorting
5617 demonstrate broken 'git cherry-pick three one two'
5618 cherry-pick/revert: respect order of revisions to pick
5621 setup: clarify error messages for file/revisions ambiguity
5623 Michael Haggerty (1):
5624 git-config.txt: fix example
5626 Michael J Gruber (6):
5627 test-lib: provide case insensitivity as a prerequisite
5628 t0050: use the CASE_INSENSITIVE_FS test prereq
5629 t0050: use the SYMLINKS test prereq
5630 test-lib: provide UTF8 behaviour as a prerequisite
5631 rebase -i: use full onto sha1 in reflog
5632 t3910: use the UTF8_NFD_TO_NFC test prereq
5634 Michał Kiedrowicz (1):
5635 tests: Introduce test_seq
5638 man: git pull -r is a short for --rebase
5640 Mischa POSLAWSKY (1):
5641 git-jump: ignore (custom) prefix in diff mode
5643 Nguyễn Thái Ngọc Duy (1):
5644 read_index_from: remove bogus errno assignments
5647 apply: delete unused deflate_origlen from patch struct
5650 test: git-stash conflict sets up rerere
5651 stash: invoke rerere in case of conflict
5654 Doc: Improve shallow depth wording
5656 Ramkumar Ramachandra (1):
5657 t/perf: add "trash directory" to .gitignore
5659 Ramsay Allan Jones (1):
5660 test-regex: Add a test to check for a bug in the regex routines
5662 Robin Rosenberg (1):
5663 cleanup precompose_utf8
5666 Make 'git submodule update --force' always check out submodules.
5669 send-email: initial_to and initial_reply_to are both optional
5672 send-email: improve RFC2047 quote parsing
5673 diff_setup_done(): return void
5674 merge-recursive: eliminate flush_buffer() in favor of write_in_full()
5676 Wesley J. Landaker (1):
5677 Documentation: indent-with-non-tab uses "equivalent tabs" not 8
5680 completion: add --no-edit to git-commit
5683 Version v1.7.12; changes since v1.7.12-rc3:
5684 -------------------------------------------
5687 Documentation: update URL for formatted pages
5691 l10n: Fixes to Swedish translation
5694 Version v1.7.12-rc3; changes since v1.7.12-rc2:
5695 -----------------------------------------------
5698 Enable HAVE_DEV_TTY for Solaris
5701 terminal: seek when switching between reading and writing
5704 l10n: Update one message in git.pot
5705 l10n: zh_CN.po: update one translation
5712 Documentation: list git-credential in plumbing commands
5715 git svn: reset invalidates the memoized mergeinfo caches
5718 l10n: Update Swedish translation (1168t0f0u)
5721 l10n: de.po: translate 77 new messages
5724 git svn: handle errors and concurrent commits in dcommit
5727 l10n: vi.po: update one message
5730 Version v1.7.12-rc2; changes since v1.7.12-rc1:
5731 -----------------------------------------------
5734 i18n: New keywords for xgettext extraction from sh
5735 i18n: rebase: mark messages for translation
5736 i18n: Rewrite gettext messages start with dash
5737 rebase: remove obsolete and unused LONG_USAGE which breaks xgettext
5738 i18n: am: mark more strings for translation
5739 Remove dead code which contains bad gettext block
5740 i18n: merge-recursive: mark strings for translation
5741 l10n: Update git.pot (4 new, 3 removed messages)
5742 l10n: zh_CN.po: translate 4 new messages
5743 l10n: Update git.pot (76 new, 4 removed messages)
5744 l10n: zh_CN.po: translate 76 new messages
5747 Makefile: use overridable $(FIND) instead of hard-coded 'find'
5750 Prepare for 1.7.11.5
5751 Drop 1.7.11.x items from 1.7.12 release notes
5755 git-remote-mediawiki: replace TODO-list in comment by appropriate link
5757 Nguyễn Thái Ngọc Duy (1):
5758 i18n: leave \n out of translated diffstat
5761 l10n: de.po: translate 4 new messages
5762 git-rebase.sh: fix typo in an error message
5763 merge-recursive: separate message for common ancestors
5766 l10n: vi.po: translate 4 new messages
5767 l10n: vi.po update to follow POT in 3b613
5770 doc: A few minor copy edits.
5773 Version v1.7.12-rc1; changes since v1.7.12-rc0:
5774 -----------------------------------------------
5777 rebase -i: handle fixup of root commit correctly
5780 git-submodule: work with GIT_DIR/GIT_WORK_TREE
5781 t7409: make sure submodule is initialized and updated in more detail
5783 Florian Achleitner (1):
5784 Add explanatory comment for transport-helpers refs mapping.
5787 link_alt_odb_entry: fix read over array bounds reported by valgrind
5790 advice: pass varargs to strbuf_vaddf, not strbuf_addf
5791 commit: check committer identity more strictly
5792 commit: document the temporary commit message file
5793 test-lib.sh: unset XDG_CONFIG_HOME
5794 attr: make sure we have an xdg path before using it
5795 t1306: check that XDG_CONFIG_HOME works
5796 t/lib-httpd: handle running under --valgrind
5797 help.c::uniq: plug a leak
5798 checkout: don't confuse ref and object flags
5799 t7502: clean up fake_editor tests
5800 t7502: properly quote GIT_EDITOR
5801 t7502: narrow checks for author/committer name in template
5802 t7502: drop confusing test_might_fail call
5803 t7502: handle systems where auto-identity is broken
5804 t7502: test early quit from commit with bad ident
5805 t: add missing executable bit to t7409
5808 test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
5809 mergetool: support --tool-help option like difftool does
5810 Update draft release notes to 1.7.12
5811 Enumerate revision range specifiers in the documentation
5812 help.c::exclude_cmds(): plug a leak
5813 perl: detect new files in MakeMaker builds
5814 Update draft release notes to 1.7.12
5819 ignore: make sure we have an xdg path before using it
5822 Make <refname> documentation more consistent.
5824 Michael G. Schwern (14):
5825 Quiet warning if Makefile.PL is run with -w and no --localedir
5826 Don't lose Error.pm if $@ gets clobbered.
5827 The Makefile.PL will now find .pm files itself.
5828 Extract some utilities from git-svn to allow extracting Git::SVN.
5829 Prepare Git::SVN for extraction into its own file.
5830 Extract Git::SVN from git-svn into its own .pm file.
5831 Move initialization of Git::SVN variables into Git::SVN.
5832 Prepare Git::SVN::Log for extraction from git-svn.
5833 Extract Git::SVN::Log from git-svn.
5834 Prepare Git::SVN::Migration for extraction from git-svn.
5835 Extract Git::SVN::Migration from git-svn.
5836 Load all the modules in one place and before running code.
5837 Move Git::IndexInfo into its own file.
5838 Extract Git::SVN::GlobSpec from git-svn.
5840 Ramsay Allan Jones (2):
5841 t1100-*.sh: Fix an intermittent test failure
5842 t7810-*.sh: Remove redundant test
5845 Version v1.7.12-rc0; changes since v1.7.11.7:
5846 ---------------------------------------------
5848 Alexander Strasser (7):
5849 t4012: modernize style for quoting
5850 t4012: Unquote git command fragment in test title
5851 t4012: Actually quote the sed script
5852 t4012: Break up pipe into serial redirections
5853 t4012: Make --shortstat test more robust
5854 t4012: Re-indent test snippets
5855 t4012: Use test_must_fail instead of if-else
5858 Fix formatting in git-config(1)
5861 rebase -i: support --root without --onto
5862 Add tests for rebase -i --root without --onto
5863 Add config variable to set HTML path for git-help --web
5864 Allow help.htmlpath to be a URL prefix
5867 vcs-svn: drop no-op reset methods
5868 vcs-svn: avoid self-assignment in dummy initialization of pre_off
5869 vcs-svn: simplify cleanup in apply_one_window
5870 vcs-svn: use constcmp instead of prefixcmp
5871 vcs-svn: use strstr instead of memmem
5872 vcs-svn: suppress signed/unsigned comparison warnings
5873 vcs-svn: suppress a signed/unsigned comparison warning
5875 Felipe Contreras (2):
5876 completion: remove executable mode
5877 completion: split __git_ps1 into a separate script
5880 git p4: refactor diffOpts calculation
5881 git p4: add support for 'p4 move' in P4Submit
5883 Guillaume Sasdy (4):
5884 git-remote-mediawiki: scripts to install, delete and clear a MediaWiki
5885 git-remote-mediawiki: test environment of git-remote-mediawiki
5886 git-remote-mediawiki (t9360): test git-remote-mediawiki clone
5887 git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push
5890 remove the impression of unexpectedness when access is denied
5892 Huynh Khoi Nguyen Nguyen (4):
5893 config: read (but not write) from $XDG_CONFIG_HOME/git/config file
5894 Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
5895 Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
5896 config: write to $XDG_CONFIG_HOME/git/config file when appropriate
5898 Javier Roucher Iglesias (1):
5899 add 'git credential' plumbing command
5902 docs: drop asciidoc7compatible flag
5903 docs: drop antique comment from Makefile
5904 docs/clone: mention that --local may be ignored
5905 clone: allow --no-local to turn off local optimizations
5906 move git_version_string into version.c
5907 version: add git_user_agent function
5908 http: get default user-agent from git_user_agent
5909 t1304: improve setfacl prerequisite setup
5910 Makefile: sort LIB_H list
5911 Makefile: fold MISC_H into LIB_H
5912 Makefile: do not have git.o depend on common-cmds.h
5913 Makefile: apply dependencies consistently to sparse/asm targets
5914 Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
5915 Makefile: split GIT_USER_AGENT from GIT-CFLAGS
5916 Makefile: split prefix flags from GIT-CFLAGS
5917 Makefile: do not replace @@GIT_VERSION@@ in shell scripts
5918 Makefile: update scripts when build-time parameters change
5919 Makefile: build instaweb similar to other scripts
5920 Makefile: move GIT-VERSION-FILE dependencies closer to use
5921 index-pack: loop while inflating objects in unpack_data
5922 revision: avoid work after --max-count is reached
5923 status: color in-progress message like other header messages
5924 docs/credential: minor clarity fixups
5925 mw-to-git: check blank credential attributes via length
5926 credential: convert "url" attribute into its parsed subparts
5927 mw-to-git: use git-credential's URL parser
5930 l10n: Update git.pot (29 new messages)
5931 l10n: zh_CN.po: translate 29 new messages
5934 t7400: avoid path mangling issues
5935 perl/Makefile: Fix a missing double-quote
5936 t4012: use 'printf' instead of 'dd' to generate a binary file
5939 submodule: additional regression tests for relative URLs
5940 submodule: document failure to handle relative superproject origin URLs
5941 submodule: fix sync handling of some relative superproject origin URLs
5942 submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
5944 Jonathan Nieder (8):
5945 vcs-svn: allow import of > 4GiB files
5946 vcs-svn: suppress -Wtype-limits warning
5947 perl/Makefile: move "mkdir -p" to module installation loop for maintainability
5948 vcs-svn: suppress a signed/unsigned comparison warning
5949 vcs-svn: allow 64-bit Prop-Content-Length
5950 Makefile: fold XDIFF_H and VCSSVN_H into LIB_H
5951 Makefile: be silent when only GIT_USER_AGENT changes
5952 Makefile: document ground rules for target-specific dependencies
5954 Junio C Hamano (58):
5955 completion: warn people about duplicated function
5956 sha1_name.c: indentation fix
5957 Kick off post 1.7.11 cycle
5958 The first batch for 1.7.12
5959 Second batch for 1.7.12
5960 Third batch for 1.7.12
5961 sha1_name.c: hide get_sha1_with_context_1() ugliness
5962 sha1_name.c: get rid of get_sha1_with_mode_1()
5963 sha1_name.c: get rid of get_sha1_with_mode()
5964 sha1_name.c: clarify what "fake" is for in find_short_object_filename()
5965 sha1_name.c: rename "now" to "current"
5966 sha1_name.c: refactor find_short_packed_object()
5967 sha1_name.c: correct misnamed "canonical" and "res"
5968 sha1_name.c: restructure disambiguation of short names
5969 get_sha1(): fix error status regression
5970 sha1_name.c: allow get_short_sha1() to take other flags
5971 sha1_name.c: teach get_short_sha1() a commit-only option
5972 Fourth batch for 1.7.12
5973 Fifth batch for 1.7.12
5974 apply: fix an incomplete comment in check_patch()
5975 apply: a bit more comments on PATH_TO_BE_DELETED
5976 apply: clear_image() clears things a bit more
5977 apply: refactor read_file_or_gitlink()
5978 apply: factor out checkout_target() helper function
5979 apply: split load_preimage() helper function out
5980 apply: refactor "previous patch" logic
5981 apply: further split load_preimage()
5982 apply: move check_to_create_blob() closer to its sole caller
5983 apply: move "already exists" logic to check_to_create()
5984 apply: accept -3/--3way command line option
5985 apply: fall back on three-way merge
5986 apply: plug the three-way merge logic in
5987 apply: move verify_index_match() higher
5988 apply: --3way with add/add conflict
5989 apply: register conflicted stages to the index
5990 apply: allow rerere() to work on --3way results
5991 apply: document --3way option
5992 sha1_name.c: get_describe_name() by definition groks only commits
5993 sha1_name.c: get_sha1_1() takes lookup flags
5994 sha1_name.c: many short names can only be committish
5995 sha1_name.c: teach lookup context to get_sha1_with_context()
5996 sha1_name.c: introduce get_sha1_committish()
5997 revision.c: allow handle_revision_arg() to take other flags
5998 revision.c: the "log" family, except for "show", takes committish
5999 sha1_name.c: add support for disambiguating other types
6000 apply: --build-fake-ancestor expects blobs
6001 commit-tree: the command wants a tree and commits
6002 reset: the command takes committish
6003 rev-parse: A and B in "rev-parse A..B" refer to committish
6004 rev-parse --disambiguate=<prefix>
6005 apply: tests for the --3way option
6006 Reduce draft release notes to 1.7.12
6007 t1512: ignore whitespaces in wc -l output
6008 t1512: match the "other" object names
6009 Sixth batch for 1.7.12
6010 Update draft release notes for 7th batch
6011 Update draft release notes to 1.7.12
6015 rebase -i: teach "--exec <cmd>"
6016 wt-status.*: better advices for git status added
6017 t7512-status-help.sh: better advices for git status
6018 status: don't suggest "git rm" or "git add" if not appropriate
6019 status: better advices when splitting a commit (during rebase -i)
6022 git-svn: don't create master if another head exists
6024 Martin von Zweigbergk (4):
6025 rebase: don't source git-sh-setup twice
6026 rebase --root: print usage on too many args
6027 am --rebasing: get patch body from commit, not from mailbox
6028 am: don't call mailinfo if $rebasing
6031 git credential fill: output the whole 'struct credential'
6032 git-remote-mediawiki: add credential support
6033 git-remote-mediawiki: don't compute the diff when getting commit message
6034 git-remote-mediawiki: don't "use encoding 'utf8';"
6035 git-remote-mediawiki: split get_mw_pages into smaller functions
6036 git-remote-mediawiki: improve support for non-English Wikis
6037 git-remote-mediawiki: support for uploading file in test environment
6038 git-remote-mediawiki: change return type of get_mw_pages
6039 git-remote-mediawiki: refactor loop over revision ids
6040 git-remote-mediawiki: extract revision-importing loop to a function
6041 git-remote-mediawiki: more efficient 'pull' in the best case
6042 git-remote-mediawiki: be more defensive when requests fail
6043 git-remote-mediawiki: update comments to reflect credential support
6044 config: fix several access(NULL) calls
6045 git-remote-mediawiki: don't split namespaces with spaces
6046 git-remote-mediawiki: actually send empty comment when they're empty
6047 git-remote-mediawiki: make mediafiles export optional
6048 git-remote-mediawiki: get rid of O(N^2) loop
6049 git-remote-mediawiki: use --force when adding notes
6050 git-remote-mediawiki: show progress information when listing pages
6051 git-remote-mediawiki: show progress information when getting last remote revision
6052 git-remote-mediawiki: properly deal with invalid remote revisions
6053 git-remote-mediawiki: fix incorrect test usage in test
6054 git-remote-mediawiki: allow page names with a ':'
6056 Michael J Gruber (1):
6057 t3404: make test 57 work with dash and others
6059 NGUYEN Kim Thuat (2):
6060 git-remote-mediawiki: send "File:" attachments to a remote wiki
6061 git-remote-mediawiki (t9363): test 'File:' import and export
6064 gitweb: Cleanup git_print_log()
6065 gitweb: Handle other types of tag in git_print_log
6066 gitweb: Add support to Link: tag
6068 Nguyễn Thái Ngọc Duy (12):
6069 index-pack: hash non-delta objects while reading from stream
6070 index-pack: use streaming interface on large blobs (most of the time)
6071 index-pack: factor out unpack core from get_data_from_pack
6072 index-pack: use streaming interface for collision test on large blobs
6073 pack-objects: use streaming interface for reading large loose blobs
6074 Unindent excluded_from_list()
6075 dir.c: get rid of the wildcard symbol set in no_wildcard()
6076 exclude: do strcmp as much as possible before fnmatch
6077 Remove i18n legos in notifying new branch tracking setup
6078 reflog: remove i18n legos in pruning message
6079 notes-merge: remove i18n legos in merge result message
6080 rerere: remove i18n legos in result message
6083 Restore use of 'help.format' configuration property in 'git help'
6086 git-remote-mediawiki: import "File:" attachments
6089 git p4 test: wait longer for p4d to start and test its pid
6090 git p4 test: use real_path to resolve p4 client symlinks
6091 git p4 test: simplify quoting involving TRASH_DIRECTORY
6092 git p4 test: never create default test repo
6093 git p4 test: rename some "git-p4 command" strings
6094 git p4 test: check for error message in failed test
6095 git p4 test: copy source indeterminate
6096 git p4 test: cleanup_git should make a new $git
6097 git p4 test: split up big t9800 test
6098 git p4 test: fix badp4dir test
6099 git p4: remove unused P4Submit interactive setting
6100 git p4 test: refactor marshal_dump
6101 git p4: notice Jobs lines in git commit messages
6104 Update Swedish translation (1095t0f0u)
6107 l10n: de.po: translate 29 new messages
6109 Ramsay Allan Jones (1):
6110 vcs-svn: rename check_overflow and its arguments for clarity
6113 tests: move code to run tests under bash into a helper library
6114 tests: add tests for the bash prompt functions in the completion script
6115 completion: respect $GIT_DIR
6117 Simon Cathebras (1):
6118 git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters
6120 Stefano Lattarini (7):
6121 autoconf: GIT_CONF_APPEND_LINE: change signature
6122 autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST
6123 autoconf: remove some redundant shell indirections
6124 autoconf: remove few redundant semicolons
6125 autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'
6126 build: "make clean" should not remove configure-generated files
6127 build: reconfigure automatically if configure.ac changes
6129 Thomas Gummerer (2):
6130 Replace strlen() with ce_namelen()
6131 Strip namelen out of ce_flags into a ce_namelen field
6134 difftool: only copy back files modified during directory diff
6136 Torsten Bögershausen (1):
6137 git on Mac OS and precomposed unicode
6140 l10n: Update translation for Vietnamese
6142 Vincent van Ravesteijn (1):
6143 help: use HTML as the default help format on Windows
6146 doc: A few minor copy edits.
6149 Version v1.7.11.7; changes since v1.7.11.6:
6150 -------------------------------------------
6153 gitk: Teach "Reread references" to reload tags
6154 gitk: Rename 'tagcontents' to 'cached_tagcontent'
6156 Felipe Contreras (1):
6157 gitk: Avoid Meta1-F5
6160 t5550: put auth-required repo in auth/dumb
6161 t5550: factor out http auth setup
6162 t/lib-httpd: only route auth/dumb to dumb repos
6163 t/lib-httpd: recognize */smart/* repos as smart-http
6164 t: test basic smart-http authentication
6165 t: test http access to "half-auth" repositories
6166 http: factor out http error code handling
6167 http: prompt for credentials on failed POST
6168 log: fix --quiet synonym for -s
6171 specifying ranges: we did not mean to make ".." an empty set
6172 apply: compute patch->def_name correctly under -p0
6173 doc: "git checkout -b/-B/--orphan" always takes a branch name
6174 split_ident_line(): make best effort when parsing author/committer line
6175 Document file-glob for "git checkout -- '*.c'"
6176 gitcli: formatting fix
6177 gitcli: contrast wildcard given to shell and to git
6181 t6300: test sort with multiple keys
6182 for-each-ref: Fix sort with multiple keys
6184 Ramsay Allan Jones (1):
6185 test-regex: Add a test to check for a bug in the regex routines
6188 Version v1.7.11.6; changes since v1.7.11.5:
6189 -------------------------------------------
6192 Fix '\ No newline...' annotation in rewrite diffs
6195 Enable HAVE_DEV_TTY for Solaris
6198 t/t5400: demonstrate breakage caused by informational message from prune
6200 Eric S. Raymond (3):
6201 contrib/ciabot: Get ciabot configuration from git variables
6202 Improved documentation for the ciabot scripts.
6203 Make the ciabot scripts completely self-configuring in the normal case.
6206 Let submodule command exit with error status if path does not exist
6207 Documentation/CodingGuidelines: spell out more shell guidelines
6210 gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
6213 commit: check committer identity more strictly
6214 diff: do not use null sha1 as a sentinel value
6215 do not write null sha1s to on-disk index
6216 fsck: detect null sha1 in tree entries
6217 terminal: seek when switching between reading and writing
6218 docs: monospace listings in docbook output
6220 Junio C Hamano (13):
6221 config: "git config baa" should exit with status 1
6222 t7406: fix misleading "rev-parse --max-count=1 HEAD"
6223 sane_execvp(): ignore non-directory on $PATH
6224 Documentation: do not mention .git/refs/* directories
6225 receive-pack: do not leak output from auto-gc to standard output
6226 sh-setup: protect from exported IFS
6227 rev-list docs: clarify --topo-order description
6228 gitcli: describe abbreviation of long options
6229 git-config doc: unconfuse an example
6230 mergetool: style fixes
6231 Prepare for 1.7.11.6
6236 builtin.h: remove unused cmd_<foo> declarations
6238 Martin von Zweigbergk (1):
6239 add tests for 'git rebase --keep-empty'
6242 setup: clarify error messages for file/revisions ambiguity
6244 Michael Haggerty (1):
6245 git-config.txt: fix example
6247 Michael J Gruber (1):
6248 rebase -i: use full onto sha1 in reflog
6250 Michał Kiedrowicz (1):
6251 tests: Introduce test_seq
6254 man: git pull -r is a short for --rebase
6256 Nguyễn Thái Ngọc Duy (1):
6257 read_index_from: remove bogus errno assignments
6260 apply: delete unused deflate_origlen from patch struct
6263 test: git-stash conflict sets up rerere
6264 stash: invoke rerere in case of conflict
6267 Make 'git submodule update --force' always check out submodules.
6270 send-email: improve RFC2047 quote parsing
6271 diff_setup_done(): return void
6272 merge-recursive: eliminate flush_buffer() in favor of write_in_full()
6275 Version v1.7.11.5; changes since v1.7.11.4:
6276 -------------------------------------------
6279 link_alt_odb_entry: fix read over array bounds reported by valgrind
6282 checkout: don't confuse ref and object flags
6284 Jonathan Nieder (4):
6285 block-sha1: avoid pointer conversion that violates alignment constraints
6286 block-sha1: put expanded macro parameters in parentheses
6287 Makefile: fix location of listing produced by "make subdir/foo.s"
6288 Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
6291 mergetool: support --tool-help option like difftool does
6292 Enumerate revision range specifiers in the documentation
6293 Prepare for 1.7.11.5
6296 Lawrence Mitchell (2):
6297 git-blame.el: Use with-current-buffer where appropriate
6298 git-blame.el: Do not use bare 0 to mean (point-min)
6301 Make <refname> documentation more consistent.
6303 Michael Schubert (1):
6304 Documentation/git-daemon: add missing word
6306 Ramkumar Ramachandra (1):
6307 commit: document a couple of options
6309 Ramsay Allan Jones (1):
6310 t7810-*.sh: Remove redundant test
6313 git: Wrong parsing of ssh urls with IPv6 literals ignores port
6315 Rüdiger Sonderfeld (2):
6316 git-blame.el: use mapc instead of mapcar
6317 git-blame.el: Do not use goto-line in lisp code
6320 doc: A few minor copy edits.
6323 Version v1.7.11.4; changes since v1.7.11.3:
6324 -------------------------------------------
6327 diff: test precedence of external diff drivers
6328 advice: pass varargs to strbuf_vaddf, not strbuf_addf
6329 commit: document the temporary commit message file
6332 submodules: don't stumble over symbolic links when cloning recursively
6335 filter-branch: do not forget the '@' prefix to force git-timestamp
6336 date.c: Fix off by one error in object-header date parsing
6337 t7003: add test to filter a branch with a commit at epoch
6338 commit-tree: resurrect command line parsing updates
6339 Revert "git-commit-tree(1): update synopsis"
6340 diff: correctly disable external_diff with --no-ext-diff
6344 am: indicate where a failed patch is to be found
6347 Version v1.7.11.3; changes since v1.7.11.2:
6348 -------------------------------------------
6351 Restore umasks influence on the permissions of work tree created by clone
6354 git-checkout: disallow --detach on unborn branch
6355 Allow edit of empty message with commit --amend
6358 fast-export: quote paths with spaces
6361 push: don't guess at qualifying remote refs on deletion
6362 add: create ADD_EDIT.patch with mode 0666
6363 commit: fix "--amend --only" with no pathspec
6365 Junio C Hamano (10):
6366 show: fix "range implies walking"
6367 t/test-lib.sh: export PERL_PATH for use in scripts
6368 tests: enclose $PERL_PATH in double quotes
6369 t/README: add a bit more Don'ts
6370 diff-index.c: do not pretend paths are pathspecs
6371 diff-index.c: unify handling of command line paths
6372 diff-index.c: "git diff" has no need to read blob from the standard input
6373 rerere: make rr-cache fanout directory honor umask
6374 cache_name_compare(): do not truncate while comparing paths
6377 Martin von Zweigbergk (1):
6378 add test case for rebase of empty commit
6381 Demonstrate git-show is broken with ranges
6383 Vincent van Ravesteijn (1):
6384 t: Replace 'perl' by $PERL_PATH
6387 Version v1.7.11.2; changes since v1.7.11.1:
6388 -------------------------------------------
6390 Carlos Martín Nieto (2):
6391 Documentation: --no-walk is no-op if range is specified
6392 git-cherry-pick.txt: clarify the use of revision range notation
6395 update-index: allow overwriting existing submodule index entries
6398 fix pager.diff with diff --no-index
6399 do not run pager with diff --no-index --quiet
6400 diff: handle relative paths in no-index
6402 Junio C Hamano (15):
6403 request-pull: really favor a matching tag
6404 ls-files -i: pay attention to exclusion of leading paths
6405 ls-files -i: micro-optimize path_excluded()
6406 tweak "bundle verify" of a complete history
6407 path_excluded(): update API to less cache-entry centric
6408 builtin/add.c: use path_excluded()
6409 unpack-trees.c: use path_excluded() in check_ok_to_remove()
6410 dir.c: make excluded() file scope static
6411 revision: "simplify" options imply topo-order sort
6412 revision: note the lack of free() in simplify_merges()
6413 archive: ustar header checksum is computed unsigned
6414 revision: ignore side parents while running simplify-merges
6415 index-pack: Disable threading on cygwin
6416 blame: compute abbreviation width that ensures uniqueness
6420 Documentation: Fix misspellings
6423 sha1_name: do not trigger detailed diagnosis for file arguments
6424 verify_filename(): ask the caller to chose the kind of diagnosis
6427 git-submodule.sh: fix filename in comment.
6429 Nguyễn Thái Ngọc Duy (1):
6430 clone: fix ref selection in --single-branch --branch=xxx
6433 Update Swedish translation (1066t0f0u)
6436 git-add--interactive.perl: Remove two unused variables
6439 diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
6442 Version v1.7.11.1; changes since v1.7.11:
6443 -----------------------------------------
6446 docs: always define git-relative-html-prefix attribute
6449 git-commit-tree(1): update synopsis
6453 Documentation: spelling fixes
6456 Version v1.7.11; changes since v1.7.11-rc3:
6457 -------------------------------------------
6459 Alexander Strasser (1):
6460 diff: Only count lines in show_shortstats
6462 Jonathan Nieder (2):
6463 perl/Makefile.PL: warn about duplicate module list in perl/Makefile
6464 perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too
6471 l10n: it.po: translate 212 new messages
6473 Ramsay Allan Jones (1):
6474 gitweb: Skip 'modification times' tests when no date parser available
6477 completion: put main git and gitk completion functions back into git namespace
6478 completion: remove credential helpers from porcelain commands
6480 Vincent van Ravesteijn (1):
6481 Do not autosquash in case of an implied interactive rebase
6484 Version v1.7.11-rc3; changes since v1.7.11-rc2:
6485 -----------------------------------------------
6488 docs: fix cross-directory linkgit references
6491 l10n: Update git.pot (27 new, 1 removed messages)
6492 l10n: zh_CN.po: translate 27 new messages
6494 Johannes Schindelin (1):
6495 fast-export: report SHA-1 instead of gibberish when marks exist already
6497 Jonathan Nieder (3):
6498 git-svn: make Git::SVN::Editor a separate file
6499 git-svn: make Git::SVN::RA a separate file
6500 git-svn: use YAML format for mergeinfo cache when possible
6503 fmt-merge-msg: make attribution into comment lines
6507 api-credential.txt: document that helpers field is filled-in automatically
6510 l10n: de.po: translate 27 new messages
6513 l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb
6516 Version v1.7.11-rc2; changes since v1.7.11-rc1:
6517 -----------------------------------------------
6520 Add persistent-https to contrib
6523 l10n: Update git.pot (5 new, 3 removed messages)
6524 l10n: zh_CN.po: translate 2 new, 3 fuzzy messages
6527 git-svn: platform auth providers are working only on 1.6.15 or newer
6528 doc: fix xref link from api docs to manual pages
6532 api-credentials.txt: show the big picture first
6533 api-credentials.txt: mention credential.helper explicitly
6534 api-credentials.txt: add "see also" section
6537 l10n: de.po: translate 265 new messages
6538 l10n: de.po: translate 41 new messages
6539 l10n: de.po: translate 2 new, 3 fuzzy messages
6540 l10n: de.po: add additional newline
6542 Ramkumar Ramachandra (1):
6543 t3510 (cherry-pick-sequence): add missing '&&'
6546 l10n: Update translation for Vietnamese
6549 Version v1.7.11-rc1; changes since v1.7.11-rc0:
6550 -----------------------------------------------
6553 rebase: report invalid commit correctly
6554 Makefile: add missing GIT-VERSION-FILE dependency
6557 ident: split setup_ident into separate functions
6558 http-push: do not access git_default_email directly
6559 fmt-merge-msg: don't use static buffer in record_person
6560 move identity config parsing to ident.c
6561 move git_default_* variables to ident.c
6562 ident: trim trailing newline from /etc/mailname
6563 format-patch: use default email for generating message ids
6564 fmt_ident: drop IDENT_WARN_ON_NO_NAME code
6565 ident: don't write fallback username into git_default_name
6566 drop length limitations on gecos-derived names and emails
6567 ident: report passwd errors with a more friendly message
6568 ident: use full dns names to generate email addresses
6569 ident: use a dynamic strbuf in fmt_ident
6570 ident: trim whitespace from default name/email
6571 format-patch: refactor get_patch_filename
6572 fetch-pack: sort incoming heads
6573 fetch-pack: avoid quadratic behavior in remove_duplicates
6574 add sorting infrastructure for list refs
6575 fetch-pack: sort the list of incoming refs
6576 fetch-pack: avoid quadratic loop in filter_refs
6577 fetch-pack: sort incoming heads list earlier
6578 ident: reword empty ident error message
6579 ident: refactor NO_DATE flag in fmt_ident
6580 ident: let callers omit name with fmt_indent
6581 format-patch: use GIT_COMMITTER_EMAIL in message ids
6582 ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT
6583 ident: reject bogus email addresses with IDENT_STRICT
6584 format-patch: do not use bogus email addresses in message ids
6585 t5701: modernize style
6586 INSTALL: update asciidoc recommendation
6589 submodules: print "registered for path" message only once
6592 l10n: Update git.pot (41 new messages)
6593 l10n: zh.CN.po: update by msgmerge git.pot
6594 l10n: zh_CN.po: translate 323 new messages
6595 l10n: Set nplurals of zh_CN.po from 1 to 2
6596 i18n: apply: split to fix a partial i18n message
6598 Jonathan Nieder (3):
6599 git-svn: move Git::SVN::Prompt into its own file
6600 git-svn: rename SVN::Git::* packages to Git::SVN::*
6601 git-svn: make Git::SVN::Fetcher a separate file
6604 refs: do not create ref_entry when searching
6605 cherry-pick: regression fix for empty commits
6606 Start preparing for 1.7.10.4
6607 Update draft release notes to 1.7.11
6612 l10n: New it.po file with 504 translations
6615 Reduce cost of deletion in levenstein distance (4 -> 3)
6617 Michael Haggerty (5):
6618 free_ref_entry(): do not trigger reading of loose refs
6619 cmd_fetch_pack(): declare dest to be const
6620 cmd_fetch_pack(): handle non-option arguments outside of the loop
6621 cmd_fetch_pack(): combine the loop termination conditions
6622 cmd_fetch_pack(): respect constness of argv parameter
6624 Nguyễn Thái Ngọc Duy (2):
6625 pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."
6626 pack-objects: refactor write_object() into helper functions
6629 Update Swedish translation (728t0f0u)
6632 refs: convert parameter of search_ref_dir() to length-limited string
6633 refs: convert parameter of create_dir_entry() to length-limited string
6634 refs: use strings directly in find_containing_dir()
6637 Init translation for Vietnamese
6638 First release translation for Vietnamese
6640 Vincent van Ravesteijn (1):
6641 Do not autosquash in case of an implied interactive rebase
6644 git-p4: Test changelists touching two branches
6645 git-p4: Verify detection of "empty" branch creation
6646 git-p4: Clean up branch test cases
6649 Version v1.7.11-rc0; changes since v1.7.10.5:
6650 ---------------------------------------------
6653 fixed order of assertion in tests
6654 sort assertion to make it more generic
6657 Fix refspecs in given example for git subtree pull.
6659 Avery Pennarun (72):
6660 basic options parsing and whatnot.
6661 'git subtree split' now basically works.
6662 We now copy the other stuff about a commit (changelog, author, etc).
6663 Print out the newly created commitid at the end, for use in other scripts.
6664 Add a new --rejoin option.
6665 Use information about prior splits to make sure merges work right.
6666 Added a --onto option, but it's so complicated I can't tell if it works.
6667 Hmm... can't actually filter rev-list on the subdir name.
6668 Skip over empty commits.
6669 Quick test script for generating reasonably complex merge scenarios.
6670 Prune out some extra merge commits by comparing their parents correctly.
6671 Even more aggressive commit trimming.
6672 Okay, that was a little too aggressive.
6673 Pass the path using the --prefix option instead of on the command line.
6674 Add a new 'git subtree add' command for adding subtrees from a given rev.
6675 Add 'git subtree merge' and 'git subtree pull'.
6676 Handle it successfully if a given parent commit has no parents.
6677 Change test.sh to test the new add, merge, and pull commands.
6679 Add --annotate option, and create recognizable file content during tests.
6680 Typo when searching for existing splits.
6681 Clarify why we can't do 'git rev-list' with a path.
6682 Add a 'create' helper function in test.sh.
6683 Add some basic assertions to test.sh.
6685 Trim some extra merge commits that don't need to go into the split tree.
6686 Only copy a commit if it has at least one nonidentical parent.
6687 test.sh: make sure no commit changes more than one file at a time.
6688 Simplify merges even more aggressively.
6689 test.sh: oops, never intended to count the raw number of commits.
6690 debug messages are off by default; use -d to enable.
6691 Abort if --rejoin fails.
6692 More to-do items based on feedback
6694 New --branch option to split command.
6695 slightly rearrange help message for split.
6696 FIXME help for --squash option
6697 merge_msg() is really more like rejoin_msg().
6698 Basic "subtree merge --squash" support.
6699 Don't squash-merge if the old and new commits are the same.
6700 Fix splitting after using a squash merge.
6701 Make --squash work with the 'add' command too.
6702 Add basic git-subtree manpage in asciidoc format.
6703 man page: add an EXAMPLES section.
6705 Some todo items reported by pmccurdy
6707 Docs: when pushing to github, the repo path needs to end in .git
6711 todo: idea for a 'git subtree grafts' command
6712 Improve patch to use git --exec-path: add to PATH instead.
6713 Fix behaviour if you have a branch named the same as your --prefix
6714 Add a README that says to email me instead of using github mail.
6715 If someone provides a --prefix that ends with slash, strip the slash.
6716 Fix a minor problem in identifying squashes vs. normal splits.
6717 cmd_pull didn't support --squash correctly.
6718 Add some tips for how to install.
6719 Oops, forgot a COPYING file. It's GPLv2.
6720 Weird, I forgot to have 'make test' call test.sh.
6721 Jakub's changes broke the progress message slightly.
6722 Make tests pass with recent git (1.7.0 and up).
6723 Improve checking for existence of the --prefix directory.
6724 Oops. Apparently I didn't run 'make test' after most recent change.
6725 Some recent tests accidentally depended on very new versions of git.
6726 (Hopefully) fix PATH setting for msysgit.
6727 Another fix for PATH and msysgit.
6729 Fix a few typos/grammar-o's in the preceding commit.
6730 It's also okay if an expected tree object is actually a commit.
6731 Skip commit objects that should be trees, rather than copying them.
6734 git-svn: support rebase --preserve-merges
6737 add installation support to Makefile
6738 make git version dynamic when building documentation
6739 Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd
6742 docs: simplify example 1
6744 Clemens Buchacher (2):
6745 merge overwrites unstaged changes in renamed file
6746 t5570: use explicit push refspec
6749 Fixing eval syntax error.
6752 docs: add simple 'add' case to clarify setup.
6753 Docs: cleaning up example textual redundancy
6755 David A. Greene (11):
6756 Move Tests Into Subdirectory
6760 Remove unnecessary git-subtree files
6761 Use project config files
6762 Use configure settings for git-subtree
6763 Install git-subtree from contrib
6764 Add subtree test Makefile
6765 Use git-subtree test Makefile
6766 Fix git-subtree install instructions
6769 t7800: Test difftool passing arguments to diff
6771 Felipe Contreras (8):
6772 tests: add initial bash completion tests
6773 completion: simplify __gitcomp_1
6774 completion: simplify by using $prev
6775 completion: add missing general options
6776 completion: simplify __git_complete_revlist_file
6777 completion: add new __git_complete helper
6778 completion: rename internal helpers _git and _gitk
6779 completion: add support for backwards compatibility
6782 Teach revision walking machinery to walk multiple times sequencially
6783 Refactor submodule push check to use string list instead of integer
6784 push: teach --recurse-submodules the on-demand option
6787 gitweb: Pass esc_html_hl_regions() options to esc_html()
6790 added -p alias for --prefix
6791 added -m/--message option for setting merge commit message
6792 allow using --branch with existing branches if it makes sense
6793 fix for subtree split not finding proper base for new commits
6794 changed alias for --prefix from -p to -P
6795 fixed bug in commit message for split
6796 added tests for recent changes
6797 added temporary test dirs to gitignore
6798 improved rev_is_descendant_of_branch() function
6801 apply: do not leak patches and fragments
6804 checkout: suppress tracking message with "-q"
6805 teach "git branch" a --quiet option
6806 doc/config: fix inline literals
6807 status: refactor colopts handling
6809 Jesse Greenwald (2):
6810 Split cmd now processes commits in topo order.
6811 Added check to order of processed commits.
6814 l10n: Update git.pot (33 new, 24 deleted messages)
6815 l10n: Update Simplified Chinese translation
6816 l10n: Update git.pot (275 new, 15 removed messages)
6817 l10n: Update git.pot (8 new, 4 removed messages)
6820 am: support --include option
6823 Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows
6824 t4006: Windows do not have /dev/zero
6825 Fix t3411.3 to actually rebase something
6828 docs: Description, synopsys, options and examples changes.
6831 git-svn: clarify the referent of dcommit's optional argument
6832 rev-parse doc: --git-dir does not always show a relative path
6834 Jonathan Nieder (15):
6835 test: use test_i18ncmp when checking --stat output
6836 test: use numstat instead of diffstat in funny-names test
6837 test: modernize funny-names test style
6838 test: test cherry-pick functionality and output separately
6839 test: use --numstat instead of --stat in "git stash show" tests
6840 test: use numstat instead of diffstat in binary-diff test
6841 diffstat summary line varies by locale: miscellany
6842 var doc: default editor and pager are configurable at build time
6843 var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
6844 test: do not rely on US English tracking-info messages
6845 test: use test_i18ncmp for "Patch format detection failed" message
6846 test: am of empty patch should not succeed
6847 fast-import doc: cat-blob and ls responses need to be consumed quickly
6848 completion: avoid trailing space for --exec-path
6849 i18n: mark relative dates for translation
6851 Junio C Hamano (45):
6852 streaming: make streaming-write-entry to be more reusable
6853 fmt-merge-msg: show those involved in a merged series
6854 apply: rename free_patch() to free_patch_list()
6855 apply: free patch->{def,old,new}_name fields
6856 apply: release memory for fn_table
6857 apply: free patch->result
6858 am -3: list the paths that needed 3-way fallback
6859 apply: free unused fragments for submodule patch
6860 varint: make it available outside the context of pack
6861 cache.h: hide on-disk index details
6862 read-cache.c: allow unaligned mapping of the index file
6863 read-cache.c: make create_from_disk() report number of bytes it consumed
6864 read-cache.c: report the header version we do not understand
6865 read-cache.c: move code to copy ondisk to incore cache to a helper function
6866 read-cache.c: move code to copy incore to ondisk cache to a helper function
6867 read-cache.c: read prefix-compressed names in index on-disk version v4
6868 read-cache.c: write prefix-compressed names in the index
6869 update-index: upgrade/downgrade on-disk index version
6870 Kick off post 1.7.10 cycle
6871 apply: drop unused macro
6872 apply: tighten constness of line buffer
6873 apply: document buffer ownership rules across functions
6874 RelNotes: the first batch of topics graduated to 'master'
6875 RelNotes: the second batch of topics graduated to 'master'
6876 mergesort: rename it to llist_mergesort()
6877 RelNotes: the third batch
6878 RelNotes: the fourth batch of topics graduated to 'master'
6879 The fifth batch of topics graduated to 'master'
6880 push.default doc: explain simple after upstream
6881 Update draft release notes to 1.7.11
6882 The sixth batch of topics graduated to 'master'
6883 unpack-trees: preserve the index file version of original
6884 index-v4: document the entry format
6885 The seventh batch of topics graduated to 'master'
6886 git-svn: introduce SVN version comparison function
6887 The eighth batch of topics graduated to 'master'
6888 refs: fix find_containing_dir() regression
6889 Makefile: NO_INSTALL_HARDLINKS
6890 The ninth batch of topics graduated to 'master'
6891 The tenth batch of topics
6892 Update draft release notes to 1.7.11 (11th batch)
6893 Update draft release notes for 12th batch
6894 git-sh-setup: define workaround wrappers before they are used
6895 Update draft release notes to 1.7.11
6899 gitweb: Don't set owner if got empty value from projects.list
6900 gitweb: Option to omit column with time of the last change
6901 gitweb: Option to not display information about owner
6904 git p4: Fixing script editor checks
6905 git p4: import/export of labels to/from p4
6906 git p4: fix-up "import/export of labels to/from p4"
6907 git p4: Squash P4EDITOR in test harness
6908 git p4: Ignore P4EDITOR if it is empty
6909 git p4: move verbose to base class
6910 git p4: fix unit tests
6911 git p4: add test for tag import/export enabled via config
6912 git p4: fix bug when verbose enabled with tag export
6913 git p4: fix bug when enabling tag import/export via config variables
6916 l10n: pt_PT.po translate new messages
6919 Documentation: explain push.default option a bit more
6920 Undocument deprecated alias 'push.default=tracking'
6921 t5528-push-default.sh: add helper functions
6922 push: introduce new push.default mode "simple"
6923 push: document the future default change for push.default (matching -> simple)
6925 Matthijs Kooijman (1):
6926 git-svn: use platform specific auth providers
6928 Michael Haggerty (32):
6929 refs.c: reorder definitions more logically
6930 refs: manage current_ref within do_one_ref()
6931 do_for_each_ref_in_array(): new function
6932 do_for_each_ref_in_arrays(): new function
6933 repack_without_ref(): reimplement using do_for_each_ref_in_array()
6934 names_conflict(): simplify implementation
6935 free_ref_entry(): new function
6936 check_refname_component(): return 0 for zero-length components
6937 struct ref_entry: nest the value part in a union
6938 refs.c: rename ref_array -> ref_dir
6939 sort_ref_dir(): simplify logic
6940 refs: store references hierarchically
6941 do_for_each_ref(): only iterate over the subtree that was requested
6942 get_ref_dir(): return early if directory cannot be read
6943 get_ref_dir(): use a strbuf to hold refname
6944 get_ref_dir(): rename "base" parameter to "dirname"
6945 get_ref_dir(): require that the dirname argument ends in '/'
6946 refs.c: extract function search_for_subdir()
6947 get_ref_dir(): take the containing directory as argument
6948 do_for_each_reflog(): return early on error
6949 do_for_each_reflog(): use a strbuf to hold logfile name
6950 bisect: copy filename string obtained from git_path()
6951 find_containing_dir(): use strbuf in implementation of this function
6952 refs: wrap top-level ref_dirs in ref_entries
6953 read_loose_refs(): rename function from get_ref_dir()
6954 get_ref_dir(): add function for getting a ref_dir from a ref_entry
6955 search_for_subdir(): return (ref_dir *) instead of (ref_entry *)
6956 struct ref_dir: store a reference to the enclosing ref_cache
6957 read_loose_refs(): eliminate ref_cache argument
6958 refs: read loose references lazily
6959 t/Makefile: retain cache t/.prove across prove runs
6960 Avoid sorting if references are added to ref_cache in order
6962 Michael Schubert (1):
6963 remote: update builtin usage
6965 Michał Kiedrowicz (7):
6966 gitweb: Use descriptive names in esc_html_hl_regions()
6967 gitweb: esc_html_hl_regions(): Don't create empty <span> elements
6968 gitweb: Extract print_sidebyside_diff_lines()
6969 gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
6970 gitweb: Push formatting diff lines to print_diff_chunk()
6971 gitweb: Highlight interesting parts of diff
6972 gitweb: Refinement highlightning in combined diffs
6975 git-cherry-pick: add allow-empty option
6976 git-cherry-pick: Add keep-redundant-commits option
6977 git-cherry-pick: Add test to validate new options
6978 git-rebase: add keep_empty flag
6979 git cherry-pick: do not dereference a potential NULL pointer
6981 Nguyễn Thái Ngọc Duy (37):
6982 Add more large blob test cases
6983 cat-file: use streaming API to print blobs
6984 parse_object: avoid putting whole blob in core
6985 show: use streaming API for showing blobs
6986 fsck: use streaming API for writing lost-found blobs
6987 update-server-info: respect core.bigfilethreshold
6988 Makefile: feed all header files to xgettext
6989 strbuf: convenience format functions with \n automatically appended
6990 i18n: help: mark strings for translation
6991 i18n: make warn_dangling_symref() automatically append \n
6992 i18n: remote: mark strings for translation
6993 i18n: apply: mark strings for translation
6994 i18n: apply: update say_patch_name to give translators complete sentence
6995 i18n: index-pack: mark strings for translation
6996 i18n: bundle: mark strings for translation
6997 help: replace underlining "help -a" headers using hyphens with a blank line
6998 Add column layout skeleton and git-column
6999 Stop starting pager recursively
7000 column: add columnar layout
7001 column: add dense layout support
7002 help: reuse print_columns() for help -a
7003 branch: add --column
7004 status: add --column
7005 column: support piping stdout to external git-column process
7007 archive-tar: turn write_tar_entry into blob-writing only
7008 archive-tar: unindent write_tar_entry by one level
7009 archive: delegate blob reading to backend
7010 archive-tar: stream large blobs to tar file
7011 branch: remove lego in i18n tracking info strings
7012 Makefile: keep many variable list sorted
7013 index-pack: restructure pack processing into three main functions
7014 index-pack: support multithreaded delta resolving
7015 index-pack: disable threading if NO_PREAD is defined
7016 apply: remove lego in i18n string in gitdiff_verify_name
7017 i18n: parseopt: lookup help and argument translations when showing usage
7018 i18n: apply: mark parseopt strings for translation
7021 Check that the type of the tree really is a tree and not a commit as it seems to sometimes become when eg. a submodule has existed in the same position previously.
7022 Use 'git merge -Xsubtree' when git version >= 1.7.0.
7023 Fixed regression with splitting out new subtree
7026 git-p4: move to toplevel
7027 git p4: update name in script
7028 git p4: use "git p4" directly in tests
7029 remove superfluous newlines in error messages
7030 remove blank filename in error message
7031 git p4: bring back files in deleted client directory
7033 git p4: fix writable file after rename or copy
7034 git p4: submit files with wildcards
7037 l10n: Update German translation
7040 Ramsay Allan Jones (5):
7041 compat/win32/pthread.h: Add an pthread_key_delete() implementation
7042 compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
7043 git-submodule.sh: Don't use $path variable in eval_gettext string
7044 git-sh-setup.sh: Add an pwd() function for MinGW
7045 builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning
7048 add mergesort() for linked lists
7049 commit: use mergesort() in commit_list_sort_by_date()
7050 revision: insert unsorted, then sort in prepare_revision_walk()
7051 sequencer: export commit_list_append()
7052 revision: append to list instead of insert and reverse
7053 commit: remove commit_list_reverse()
7054 streaming: void pointer instead of char pointer
7055 archive-zip: remove uncompressed_size
7056 archive-zip: factor out helpers for writing sizes and CRC
7057 archive-zip: streaming for stored files
7058 archive-zip: streaming for deflated files
7059 t5000: rationalize unzip tests
7060 dir: convert to strbuf
7061 xdiff: add hunk_func()
7062 blame: use hunk_func(), part 1
7063 blame: use hunk_func(), part 2
7064 blame: factor out helper for calling xdi_diff()
7065 xdiff: remove emit_func() and xdi_diff_hunks()
7066 xdiff: remove unused functions
7067 dir: respect string length argument of read_directory_recursive()
7068 dir: simplify fill_directory()
7069 archive: simplify refname handling
7070 archive-tar: keep const in checksum calculation
7071 xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines
7072 xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
7073 xdiff: import new 32-bit version of count_masked_bytes()
7076 git-svn: use POSIX::sigprocmask to block signals
7077 git-svn: ignore SIGPIPE
7078 git-svn: drop redundant blocking of SIGPIPE
7081 tests: add tests for the __gitcomp() completion helper function
7082 completion: fix completion after 'git --option <TAB>'
7084 Sebastian Pipping (1):
7085 gitweb: Fix unintended "--no-merges" for regular Atom feed
7087 Stefano Lattarini (3):
7088 configure: move definitions of private m4 macros before AC_INIT invocation
7089 configure: avoid some code repetitions thanks to m4_{push,pop}def
7090 configure: be more idiomatic
7093 xdiff: load full words in the inner loop of xdl_hash_record
7094 xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE
7097 difftool: parse options using Getopt::Long
7098 difftool: add '--no-gui' option
7099 difftool: exit(0) when usage is printed
7100 difftool: remove explicit change of PATH
7101 difftool: stop appending '.exe' to git
7102 difftool: eliminate setup_environment function
7103 difftool: teach difftool to handle directory diffs
7104 difftool: print list of valid tools with '--tool-help'
7107 gitweb: add `status` headers to git_feed() responses.
7108 gitweb: refactor If-Modified-Since handling
7109 gitweb: add If-Modified-Since handling to git_snapshot().
7112 Added new 'push' command and 2-parameter form of 'add'.
7115 git-subtree.txt: add another example.
7116 Make sure that <prefix> exists when splitting.
7118 Zbigniew Jędrzejewski-Szmek (13):
7119 t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
7120 t0303: resurrect commit message as test documentation
7121 t1507: add tests to document @{upstream} behaviour
7122 Provide branch name in error message when using @{u}
7123 Provide better message for barnhc_wiht_tpyo@{u}
7124 Be more specific if upstream branch is not tracked
7125 i18n: mark @{upstream} error messages for translation
7126 t9002: work around shells that are unable to set COLUMNS to 1
7127 diff --stat: use less columns for change counts
7128 test: modernize style of t4006
7129 tests: check --[short]stat output after chmod
7130 diff --stat: report mode-only changes for binary files like text files
7131 diff --stat: do not run diff on indentical files
7134 Add explicit path of git installation by 'git --exec-path'.
7136 Ævar Arnfjörð Bjarmason (3):
7137 git-branch: remove lego in i18n messages
7138 git-commit: remove lego in i18n messages
7139 git-commit: remove lego in i18n messages
7142 Version v1.7.10.5; changes since v1.7.10.4:
7143 -------------------------------------------
7145 Johannes Schindelin (1):
7146 fast-export: report SHA-1 instead of gibberish when marks exist already
7151 Vincent van Ravesteijn (1):
7152 Do not autosquash in case of an implied interactive rebase
7155 Version v1.7.10.4; changes since v1.7.10.3:
7156 -------------------------------------------
7159 checkout: no progress messages if !isatty(2).
7162 rebase: report invalid commit correctly
7163 Makefile: add missing GIT-VERSION-FILE dependency
7166 fix off-by-one error in split_ident_line
7167 pretty: avoid buffer overflow in format_person_part
7168 avoid segfault when reading header of malformed commits
7171 Start preparing for 1.7.10.4
7175 Update Swedish translation (728t0f0u)
7178 grep: factor out create_grep_pat()
7179 grep: factor out do_append_grep_pat()
7180 grep: support newline separated pattern list
7181 grep: stop leaking line strings with -f
7184 Version v1.7.10.3; changes since v1.7.10.2:
7185 -------------------------------------------
7188 diff --no-index: reset temporary buffer lengths on directory iteration
7189 diff --no-index: don't leak buffers in queue_diff
7191 Carlos Martín Nieto (1):
7192 pack-protocol: fix first-want separator in the examples
7195 clone: fix progress-regression
7196 checkout: do not corrupt HEAD on empty repo
7199 link to gitmodules page at the beginning of git-submodule documentation
7200 teach add_submodule_odb() to look for alternates
7203 log-tree: use custom line terminator in line termination mode
7206 docs: stop using asciidoc no-inline-literal
7207 t1411: add more selector index/date tests
7208 log: respect date_mode_explicit with --format:%gd
7209 reflog-walk: clean up "flag" field of commit_reflog struct
7210 reflog-walk: always make HEAD@{0} show indexed selectors
7211 commit: refactor option parsing
7212 status: refactor null_termination option
7213 status: fix null termination with "-b"
7214 status: respect "-b" for porcelain format
7215 osxkeychain: pull make config from top-level directory
7218 Consistently use "superproject" instead of "supermodule"
7221 l10n: Update git.pot (1 new messages)
7222 l10n: zh_CN.po: translate 1 new message
7223 l10n: Update git.pot (3 new, 2 removed messages)
7224 l10n: zh_CN.po: translate 3 new messages
7227 t2020-checkout-detach: check for the number of orphaned commits
7228 checkout (detached): truncate list of orphaned commits at the new HEAD
7229 t3404: begin "exchange commits with -p" test with correct preconditions
7231 Jonathan Nieder (1):
7232 config doc: remove confusion about relative GIT_DIR from FILES section
7235 log-tree: the previous one is still not quite right
7236 reflog-walk: tell explicit --date=default from not having --date at all
7237 Start preparing for 1.7.10.3
7238 Update draft release notes to 1.7.10.3
7242 fmt-merge-message: add empty line between tag and signature verification
7245 l10n: add new members to German translation team
7246 l10n: de.po: translate "track" as "beobachten"
7247 l10n: de.po: translate "remote" as "extern"
7248 l10n: de.po: collection of improvements
7249 l10n: de.po: unify translation of "ahead" and "behind"
7250 l10n: de.po: translate one new message
7251 l10n: de.po: translate 3 new messages
7254 l10n: de.po: translate "bare" as "bloß"
7255 l10n: de.po: hopefully uncontroversial fixes
7256 l10n: de.po: translate "bad" as "ungültig" ("invalid")
7257 l10n: de.po: collection of suggestions
7260 Version v1.7.10.2; changes since v1.7.10.1:
7261 -------------------------------------------
7264 grep.c: remove redundant line of code
7267 Avoid bug in Solaris xpg4/sed as used in submodule
7269 Christian Couder (1):
7270 revert: add missing va_end
7272 Christopher Tiwald (2):
7273 push: Provide situational hints for non-fast-forward errors
7274 Fix httpd tests that broke when non-ff push advice changed
7276 Clemens Buchacher (3):
7277 http auth fails with multiple curl handles
7278 properly keep track of current working directory
7279 cherry-pick: do not expect file arguments
7281 Florian Achleitner (1):
7282 Documentation/git-config: describe and clarify "--local <file>" option
7285 document submdule.$name.update=none option for gitmodules
7288 clean up struct ref's nonfastforward field
7289 http-backend: respect existing GIT_COMMITTER_* variables
7290 fix http auth with multiple curl handles
7291 gc: do not explode objects which will be immediately pruned
7292 http: clean up leak in init_curl_http_auth
7293 http: use newer curl options for setting credentials
7294 argv-array: refactor empty_argv initialization
7295 argv-array: add a new "pushl" method
7296 gc: use argv-array for sub-commands
7297 config: reject bogus section names for --rename-section
7298 config: expand tildes in include.path variable
7299 send-pack: show progress when isatty(2)
7300 teach send-pack about --[no-]progress
7301 t5541: test more combinations of --progress
7302 t/gitweb-lib: use $PERL_PATH to run gitweb
7305 diff: avoid stack-buffer-read-overrun for very long name
7308 t9300-fast-import: avoid 'exit' in test_expect_success snippets
7309 t5570: fix forwarding of git-daemon messages via cat
7311 Junio C Hamano (13):
7312 xdiff: remove XDL_PATCH_* macros
7313 xdiff: PATIENCE/HISTOGRAM are not independent option bits
7314 rebase -i: remind that the lines are top-to-bottom
7315 builtin/merge.c: remove "remoteheads" global variable
7316 builtin/merge.c: collect other parents early
7317 builtin/merge.c: reduce parents early
7318 fmt-merge-msg: discard needless merge parents
7319 t9400: fix gnuism in grep
7320 diff --no-index: use strbuf for temporary pathnames
7321 contrib/rerere-train: use installed git-sh-setup
7322 Start preparing for 1.7.10.2
7323 Update draft release notes to 1.7.10.2
7327 Add output_prefix_length to diff_options
7328 Adjust stat width calculations to take --graph output into account
7329 t4052: Adjust --graph --stat output for prefixes
7330 t4052: Test diff-stat output with minimum columns
7331 Prevent graph_width of stat width from falling below min
7334 fetch: Give remote_ref to update_local_ref() as well
7335 fetch: describe new refs based on where it came from
7337 Michał Kiedrowicz (1):
7338 merge tests: octopus with redundant parents
7341 git-remote-testgit: fix race when spawning fast-import
7342 git p4 doc: fix formatting
7345 sequencer: remove additional blank line
7348 unpack-trees: don't perform any index operation if we're not merging
7349 unpack-trees: plug minor memory leak
7352 rev-parse --show-prefix: add in trailing newline
7353 stash: use eval_gettextln correctly
7355 Stefano Lattarini (1):
7356 tests: modernise style: more uses of test_line_count
7358 Zbigniew Jędrzejewski-Szmek (4):
7359 t4052: test --stat output with --graph
7360 test-lib: skip test with COLUMNS=1 under mksh
7361 t4052: work around shells unable to set COLUMNS to 1
7362 Consistently use perl from /usr/bin/ for scripts
7365 Version v1.7.10.1; changes since v1.7.10:
7366 -----------------------------------------
7369 git-commit.txt: clarify -t requires editing message
7372 l10n: New da.po file with 0 translations
7373 l10n: Add Danish team (da) to list of teams
7376 fetch-pack: new --stdin option to read refs from stdin
7377 remote-curl: send the refs to fetch-pack on stdin
7378 fetch-pack: test cases for the new --stdin option
7379 remote-curl: main test case for the OS command line overflow
7382 drop casts from users EMPTY_TREE_SHA1_BIN
7383 make is_empty_blob_sha1 available everywhere
7384 teach diffcore-rename to optionally ignore empty content
7385 merge-recursive: don't detect renames of empty files
7386 add--interactive: ignore unmerged entries in patch mode
7387 run-command: treat inaccessible directories as ENOENT
7390 submodules: recursive fetch also checks new tags for submodule commits
7393 l10n: Update git.pot (2 new messages)
7394 l10n: Update Simplified Chinese translation
7397 t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
7398 notes-merge: use opendir/readdir instead of using read_directory()
7399 notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
7402 t4034: diff.*.wordregex should not be "sticky" in --word-diff
7405 rebase -i continue: don't skip commits that only change submodules
7407 Jonathan Nieder (1):
7408 bundle: remove stray single-quote from error message
7410 Junio C Hamano (16):
7411 ident.c: add split_ident_line() to parse formatted ident line
7412 t7503: does pre-commit-hook learn authorship?
7413 commit: pass author/committer info to hooks
7414 remove_dir_recursively(): Add flag for skipping removal of toplevel dir
7415 clean: preserve nested git worktree in subdirectories
7416 t7501: test the right kind of breakage
7417 commit: do not trigger bogus "has templated message edited" check
7418 commit: rephrase the error when user did not touch templated log message
7419 Documentation/git-commit: rephrase the "initial-ness" of templates
7420 push: error out when the "upstream" semantics does not make sense
7421 blame: accept --need-minimal
7425 Start preparing for 1.7.10.1
7429 log --graph --stat: three-dash separator should come after graph lines
7430 log --graph: fix break in graph lines
7431 t4202: add test for "log --graph --stat -p" separator lines
7434 l10n: Updated pt_PT language
7437 fast-import: tighten parsing of datarefs
7440 l10n: Add the German translation team and initialize de.po
7441 l10n: Initial German translation
7443 Ramsay Allan Jones (1):
7444 compat/mingw.[ch]: Change return type of exec functions to int
7447 combine-diff: fix loop index underflow
7448 submodule: fix prototype of gitmodules_config
7449 test-subprocess: fix segfault without arguments
7452 diff: refactor the word-diff setup from builtin_diff_cmd
7453 diff: tweak a _copy_ of diff_options with word-diff
7456 Version v1.7.10; changes since v1.7.10-rc4:
7457 -------------------------------------------
7459 Felipe Contreras (1):
7460 spec: add missing build dependency
7466 Version v1.7.10-rc4; changes since v1.7.10-rc3:
7467 -----------------------------------------------
7470 string-list: document that string_list_insert() inserts unique strings
7473 l10n: Improve zh_CN translation for Git 1.7.10-rc3
7476 merge: backport GIT_MERGE_AUTOEDIT support
7481 l10n: Inital Portuguese Portugal language (pt_PT)
7484 gitk: fix tabbed preferences construction when using tcl 8.4
7485 gitk: fix setting font display with new tabbed dialog layout.
7488 config: remove useless assignment
7490 Vincent van Ravesteijn (1):
7491 l10n: Add the Dutch translation team and initialize nl.po
7494 Version v1.7.10-rc3; changes since v1.7.10-rc2:
7495 -----------------------------------------------
7497 Frédéric Brière (1):
7498 gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields
7501 l10n: Update git.pot (1 new message)
7502 l10n: Update zh_CN translation for Git 1.7.10-rc1
7503 l10n: Review zh_CN translation for Git 1.7.10-rc1
7504 Add url of Swedish l10n team in TEAMS file
7507 gitk: Make "git describe" output clickable, too
7508 correct spelling: an URL -> a URL
7509 correct a few doubled-word nits in comments and documentation
7511 Jonathan Nieder (1):
7512 gitk: Use symbolic font names "sans" and "monospace" when available
7516 Update draft release notes to 1.7.10
7519 Marcus Karlsson (1):
7520 gitk: Teach gitk to respect log.showroot
7523 grep doc: add --break / --heading / -W to synopsis
7525 Nelson Benitez Leon (1):
7526 documentation: fix alphabetic ordered list for git-rebase man page
7529 gitk: Use a tabbed dialog to edit preferences
7530 gitk: Fix the display of files when filtered by path
7533 gitk: Speed up resolution of short SHA1 ids
7534 gitk: Add menu items for comparing a commit with the marked commit
7537 Update Swedish translation (724t0f0u).
7539 Rodrigo Silva (MestreLion) (1):
7540 Documentation: improve description of GIT_EDITOR and preference order
7542 Zbigniew Jędrzejewski-Szmek (2):
7543 gitk: Use "gitk: repo-top-level-dir" as window title
7544 tests: unset COLUMNS inherited from environment
7547 Version v1.7.10-rc2; changes since v1.7.10-rc1:
7548 -----------------------------------------------
7551 contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
7554 Documentation/gitweb: trivial English fixes
7556 Jonathan Nieder (2):
7557 fast-import: leakfix for 'ls' of dirty trees
7558 fast-import: don't allow 'ls' of path with empty components
7561 fetch/receive: remove over-pessimistic connectivity check
7562 Update draft release notes to 1.7.10
7563 .mailmap: unify various old mail addresses of gitster
7566 Stefano Lattarini (1):
7567 configure: allow user to prevent $PATH "sanitization" on Solaris
7570 Documentation/diff-options: reword description of --submodule option
7571 contrib/diffall: comment actual reason for 'cdup'
7572 contrib/diffall: create tmp dirs without mktemp
7573 contrib/diffall: eliminate use of tar
7574 contrib/diffall: eliminate duplicate while loops
7575 contrib/diffall: fix cleanup trap on Windows
7576 Documentation/difftool: add deltawalker to list of valid diff tools
7578 Ævar Arnfjörð Bjarmason (2):
7579 Git::I18N: compatibility with perl <5.8.3
7580 perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
7583 Version v1.7.10-rc1; changes since v1.7.10-rc0:
7584 -----------------------------------------------
7587 verify-tag: Parse GPG configuration options.
7590 gitweb: Fix fixed string (non-regexp) project search
7593 submodules: always use a relative path to gitdir
7594 submodules: always use a relative path from gitdir to work tree
7595 submodules: refactor computation of relative gitdir path
7598 l10n: Update zh_CN translation for 1.7.9.2
7599 l10n: Update git.pot (1 new message)
7600 l10n: Update zh_CN translation for 1.7.10-rc0
7603 submodules: fix ambiguous absolute paths under Windows
7606 Update draft release notes to 1.7.10
7607 t0204: clarify the "observe undefined behaviour" test
7608 i18n: fix auto detection of gettext scheme for shell scripts
7610 Update draft release notes to 1.7.10 before -rc1
7611 am: officially deprecate -b/--binary option
7615 fix deletion of .git/objects sub-directories in git-prune/repack
7617 Martin Stenberg (1):
7618 config: report errors at the EOL with correct line number
7621 po/sv.po: add Swedish translation
7622 Update Swedish translation (732t0f0u).
7625 rerere: Document 'rerere remaining'
7628 perf: load test-lib-functions from the correct directory
7629 perf: export some important test-lib variables
7630 p4000: use -3000 when promising -3000
7631 git-am: error out when seeing -b/--binary
7634 l10n: Improve zh_CN translation for lines insertion and deletion.
7635 l10n: Improve zh_CN translation for msg about branch deletion deny
7636 l10n: Improve zh_CN translation for empty cherry-pick msg.
7637 l10n: Improve zh_CN translation for msg that make empty commit when amend.
7638 l10n: Improve commit msg for zh_CN translation
7639 l10n: Improve zh_CN trans for msg that cannot fast-forward
7640 l10n: Improve zh_CN translation for msg "not something we can merge"
7642 Vincent van Ravesteijn (3):
7643 Documentation/git-branch: cleanups
7644 Documentation/git-branch: fix a typo
7645 Documentation/git-branch: add default for --contains
7648 Version v1.7.10-rc0; changes since v1.7.9.7:
7649 --------------------------------------------
7652 completion: --edit and --no-edit for git-merge
7655 add a Makefile switch to avoid gettext translation in shell scripts
7657 Bernhard R. Link (6):
7658 gitweb: move hard coded .git suffix out of git_get_projects_list
7659 gitweb: prepare git_get_projects_list for use outside 'forks'.
7660 gitweb: add project_filter to limit project list to a subdirectory
7661 gitweb: limit links to alternate forms of project_list to active project_filter
7662 gitweb: show active project_filter in project_list page header
7663 gitweb: place links to parent directories in page header
7665 Carlos Martín Nieto (1):
7666 Make git-{pull,rebase} message without tracking information friendlier
7668 Clemens Buchacher (3):
7669 git-daemon: add tests
7670 git-daemon: produce output when ready
7671 git-daemon tests: wait until daemon is ready
7674 vcs-svn: set up channel to read fast-import cat-blob response
7675 vcs-svn: quote paths correctly for ls command
7676 vcs-svn: use mark from previous import for parent commit
7677 vcs-svn: pass paths through to fast-import
7678 vcs-svn: drop string_pool
7680 vcs-svn: drop obj_pool
7681 vcs-svn: avoid using ls command twice
7682 vcs-svn: implement text-delta handling
7685 vcs-svn: do not initialize report_buffer twice
7686 vcs-svn: reset first_commit_done in fast_export_init
7688 Felipe Contreras (4):
7689 remote: use a local variable in match_push_refs()
7690 remote: reorganize check_pattern_match()
7691 remote: refactor code into alloc_delete_ref()
7692 push: add '--prune' option
7694 Frédéric Heitzmann (1):
7695 completion: add --interactive option to git svn dcommit
7697 Jakub Narębski (11):
7698 gitweb: improve usability of projects search form
7699 gitweb: Make project search respect project_filter
7700 gitweb: Harden and improve $project_filter page title
7701 gitweb: Refactor checking if part of project info need filling
7702 gitweb: Option for filling only specified info in fill_project_list_info
7703 gitweb: Faster project search
7704 gitweb: Introduce esc_html_match_hl and esc_html_hl_regions
7705 gitweb: Highlight matched part of project name when searching projects
7706 gitweb: Highlight matched part of project description when searching projects
7707 gitweb: Highlight matched part of shortened project description
7708 gitweb: Fix passing parameters to git_project_search_form
7711 symbolic-ref --short: abbreviate the output unambiguously
7714 Add threaded versions of functions in symlinks.c.
7717 parse_object: try internal cache before reading object db
7718 upload-pack: avoid parsing objects during ref advertisement
7719 upload-pack: avoid parsing tag destinations
7720 t0300: use write_script helper
7721 docs: add a basic description of the config API
7722 drop odd return value semantics from userdiff_config
7723 diff-highlight: make perl strict and warnings fatal
7724 diff-highlight: don't highlight whole lines
7725 diff-highlight: refactor to prepare for multi-line hunks
7726 diff-highlight: match multi-line hunks
7727 diff-highlight: document some non-optimal cases
7728 docs/api-config: minor clarifications
7729 t1300: add missing &&-chaining
7730 config: copy the return value of prefix_filename
7731 config: teach git_config_set_multivar_in_file a default path
7732 config: teach git_config_rename_section a file argument
7733 config: provide a version of git_config with more options
7734 config: stop using config_exclusive_filename
7735 config: eliminate config_exclusive_filename
7736 config: add include directive
7739 Add a setting to require a filter to be successful
7742 test-lib: add the test_pause convenience function
7745 l10n: initial git.pot for 1.7.10 upcoming release
7747 l10n: Update git.pot (12 new messages)
7748 l10n: update Chinese translation to the new git.po
7749 Update l10n guide: change the repository URL, etc
7751 Jonathan Nieder (23):
7752 vcs-svn: use higher mark numbers for blobs
7753 vcs-svn: save marks for imported commits
7754 vcs-svn: add a comment before each commit
7755 vcs-svn: eliminate repo_tree structure
7756 vcs-svn: handle filenames with dq correctly
7757 Makefile: list one vcs-svn/xdiff object or header per line
7758 vcs-svn: learn to maintain a sliding view of a file
7759 vcs-svn: make buffer_read_binary API more convenient
7760 vcs-svn: skeleton of an svn delta parser
7761 vcs-svn: parse svndiff0 window header
7762 vcs-svn: read the preimage when applying deltas
7763 vcs-svn: read inline data from deltas
7764 vcs-svn: read instructions from deltas
7765 vcs-svn: implement copyfrom_data delta instruction
7766 vcs-svn: verify that deltas consume all inline data
7767 vcs-svn: let deltas use data from postimage
7768 vcs-svn: let deltas use data from preimage
7769 test-svn-fe: split off "test-svn-fe -d" into a separate function
7770 vcs-svn: cap number of bytes read from sliding view
7771 vcs-svn: guard against overflow when computing preimage length
7772 vcs-svn: avoid hangs from corrupt deltas
7773 vcs-svn: allow import of > 4GiB files
7774 vcs-svn: suppress a -Wtype-limits warning
7776 Junio C Hamano (28):
7777 git-sh-i18n: restructure the logic to compute gettext.sh scheme
7778 i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
7779 merge: use editor by default in interactive sessions
7780 push: do not let configured foreign-vcs permanently clobbered
7781 t9801: do not overuse test_must_fail
7782 i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
7783 vcs-svn/svndiff.c: squelch false "unused" warning from gcc
7784 Kick off the post 1.7.9 cycle
7785 Update draft release notes to 1.7.10
7786 Update draft release notes to 1.7.10
7787 Update draft release notes to 1.7.10
7788 Update draft release notes to 1.7.10
7789 Update draft release notes to 1.7.10
7790 Update draft release notes to 1.7.10
7791 t9100: remove bogus " || test" after each test scriptlet
7792 merge: do not trust fstat(2) too much when checking interactiveness
7793 Update draft release notes to 1.7.10
7794 Update draft release notes to 1.7.10
7795 Update draft release notes to 1.7.10
7796 grep: use static trans-case table
7797 fsck: --no-dangling omits "dangling object" information
7798 pickaxe: allow -i to search in patch case-insensitively
7800 diff --stat: tests for long filenames and big change counts
7801 Update draft release notes to 1.7.10
7802 Update draft release notes to 1.7.10
7803 fsck doc: a minor typofix
7807 "git pull" doesn't know "--edit"
7810 git-p4: handle p4 branches and labels containing shell chars
7811 git-p4: cope with labels with empty descriptions
7812 git-p4: importing labels should cope with missing owner
7813 git-p4: add test for p4 labels
7814 git-p4: label import fails with multiple labels at the same changelist
7815 git-p4: add initial support for RCS keywords
7817 Michael Haggerty (11):
7818 pack_refs(): remove redundant check
7819 ref_array: keep track of whether references are sorted
7820 add_packed_ref(): new function in the refs API.
7821 write_remote_refs(): create packed (rather than extra) refs
7822 t5700: document a failure of alternates to affect fetch
7823 clone.c: move more code into the "if (refs)" conditional
7824 fetch-pack.c: rename some parameters from "path" to "refname"
7825 fetch-pack.c: inline insert_alternate_refs()
7826 everything_local(): mark alternate refs as complete
7827 clone: do not add alternate references to extra_refs
7828 refs: remove the extra_refs API
7830 Michał Kiedrowicz (2):
7831 pack-objects: Fix compilation with NO_PTHREDS
7832 grep -P: add tests for matching ^ and $
7834 Nelson Benitez Leon (1):
7835 http: support proxies that require authentication
7837 Nguyễn Thái Ngọc Duy (20):
7838 clone: add --single-branch to fetch only one branch
7839 Fix incorrect ref namespace check
7840 Eliminate recursion in setting/clearing marks in commit list
7841 index-pack: eliminate recursion in find_unresolved_deltas
7842 index-pack: eliminate unlimited recursion in get_base_data()
7843 t5601: add missing && cascade
7844 clone: write detached HEAD in bare repositories
7845 clone: factor out checkout code
7846 clone: factor out HEAD update code
7847 clone: factor out remote ref writing
7848 clone: delay cloning until after remote HEAD checking
7849 clone: --branch=<branch> always means refs/heads/<branch>
7850 clone: refuse to clone if --branch points to bogus ref
7851 clone: allow --branch to take a tag
7852 clone: print advice on checking out detached HEAD
7853 clone: fix up delay cloning conditions
7854 pack-objects: do not accept "--index-version=version,"
7855 pack-objects: remove bogus comment
7856 pack-objects: convert to use parse_options()
7857 cache-tree: update API to take abitrary flags
7860 git-p4: only a single ... wildcard is supported
7861 git-p4: fix verbose comment typo
7862 git-p4: clarify comment
7863 git-p4: adjust test to adhere to stricter useClientSpec
7864 git-p4: add tests demonstrating spec overlay ambiguities
7865 git-p4: Change p4 command invocation
7868 cherry-pick: No advice to commit if --no-commit
7870 Philip Jägenstedt (2):
7871 completion: remote set-* <name> and <branch>
7872 completion: normalize increment/decrement style
7874 Ramkumar Ramachandra (2):
7875 revert: prepare to move replay_action to header
7876 sequencer: factor code out of revert builtin
7878 Ramsay Allan Jones (3):
7879 vcs-svn: rename check_overflow arguments for clarity
7880 builtin/tag.c: Fix a sparse warning
7881 ctype.c: Fix a sparse warning
7884 xdiff: print post-image for common records instead of pre-image
7885 test-parse-options: convert to OPT_BOOL()
7886 parse-options: allow positivation of options starting, with no-
7887 parse-options: remove PARSE_OPT_NEGHELP
7888 parse-options: typo check for unknown switches
7891 l10n: update zh_CN translation for "Fetching %s"
7894 git-p4: the option to specify 'host' is -H, not -h
7896 Stefano Lattarini (1):
7897 t0000: modernise style
7900 git-svn.perl: perform deletions before anything else
7901 git-svn.perl: fix a false-positive in the "already exists" test
7904 am: learn passing -b to mailinfo
7905 mailinfo: with -b, keep space after [foo]
7906 Move the user-facing test library to test-lib-functions.sh
7907 Introduce a performance testing framework
7908 Add a performance test for git-grep
7909 perf: compare diff algorithms
7912 contrib: add git-diffall script
7913 mergetools: add a plug-in to support DeltaWalker
7916 tag: add --points-at list option
7919 git-p4: Search for parent commit on branch creation
7920 git-p4: Add test case for complex branch import
7922 Wei-Yin Chen (陳威尹) (1):
7923 git-svn: Fix time zone in --localtime
7926 l10n: fast-forward here is ff-only merge, not push
7928 Zbigniew Jędrzejewski-Szmek (11):
7929 make lineno_width() from blame reusable for others
7930 send-email: document the --smtp-debug option
7931 git-p4: missing she-bang line in t9804 confuses prove
7932 diff --stat: use the full terminal width
7933 show --stat: use the full terminal width
7934 log --stat: use the full terminal width
7935 merge --stat: use the full terminal width
7936 diff --stat: use a maximum of 5/8 for the filename part
7937 diff --stat: add a test for output with COLUMNS=40
7938 diff --stat: enable limiting of the graph part
7939 diff --stat: add config option to limit graph width
7942 l10n: leave leading space unchanged for zh_CN.po
7944 Ævar Arnfjörð Bjarmason (2):
7945 git-svn: remove redundant porcelain option to rev-list
7946 git-svn: un-break "git svn rebase" when log.abbrevCommit=true
7949 Version v1.7.9.7; changes since v1.7.9.6:
7950 -----------------------------------------
7953 Documentation/gitweb: trivial English fixes
7955 Jonathan Nieder (1):
7956 bundle: remove stray single-quote from error message
7959 fetch/receive: remove over-pessimistic connectivity check
7965 Version v1.7.9.6; changes since v1.7.9.5:
7966 -----------------------------------------
7969 string-list: document that string_list_insert() inserts unique strings
7972 merge: backport GIT_MERGE_AUTOEDIT support
7976 Version v1.7.9.5; changes since v1.7.9.4:
7977 -----------------------------------------
7980 gitweb: Fix actionless dispatch for non-existent objects
7982 Jonathan Nieder (2):
7983 fast-import: leakfix for 'ls' of dirty trees
7984 fast-import: don't allow 'ls' of path with empty components
7987 i18n of multi-line advice messages
7991 t/Makefile: Use $(sort ...) explicitly where needed
7994 grep doc: add --break / --heading / -W to synopsis
7996 Martin Stenberg (1):
7997 config: report errors at the EOL with correct line number
7999 Nelson Benitez Leon (1):
8000 documentation: fix alphabetic ordered list for git-rebase man page
8003 rerere: Document 'rerere remaining'
8005 Rodrigo Silva (MestreLion) (1):
8006 Documentation: improve description of GIT_EDITOR and preference order
8009 Version v1.7.9.4; changes since v1.7.9.3:
8010 -----------------------------------------
8013 gitweb: Fix fixed string (non-regexp) project search
8016 am -3: allow nonstandard -p<num> option
8017 test: "am -3" can accept non-standard -p<num>
8018 t4011: modernise style
8019 t4011: illustrate "diff-index -p" on stat-dirty paths
8020 diff -p: squelch "diff --git" header for stat-dirty paths
8024 t5510: refactor bundle->pack conversion
8025 t5510: ensure we stay in the toplevel test dir
8026 bundle: keep around names passed to add_pending_object()
8027 Document the --histogram diff option
8028 t5704: fix nonportable sed/grep usages
8031 Version v1.7.9.3; changes since v1.7.9.2:
8032 -----------------------------------------
8035 rebase -m: only call "notes copy" when rewritten exists and is non-empty
8037 Carlos Martín Nieto (2):
8038 branch: don't assume the merge filter ref exists
8039 Documentation: use {asterisk} in rev-list-options.txt when needed
8041 Clemens Buchacher (1):
8042 http.proxy: also mention https_proxy and all_proxy
8044 Dmitry V. Levin (1):
8045 Makefile: add thread-utils.h to LIB_H
8048 gitweb: Fix "heads" view when there is no current branch
8049 gitweb: Handle invalid regexp in regexp search
8052 disconnect from remote helpers more gently
8053 teach convert_to_git a "dry run" mode
8054 teach dry-run convert_to_git not to require a src buffer
8055 do not stream large files to pack when filters are in use
8058 Ignore SIGPIPE when running a filter driver
8061 am: don't infloop for an empty input file
8063 John Szakmeister (1):
8064 configure: don't use -lintl when there is no gettext support
8066 Jonathan Nieder (1):
8067 mergetools/meld: Use --help output to detect --output support
8070 refresh_index: do not show unmerged path that is outside pathspec
8071 Documentation/merge-options.txt: group "ff" related options together
8072 Document merge.branchdesc configuration variable
8074 Document accumulated fixes since 1.7.9.2
8075 Update draft release notes to 1.7.9.3
8076 Documentation: do not assume that n > 1 in <rev>~$n
8077 Update draft release notes to 1.7.9.3 for the last time
8081 Documentation fixes in git-config
8084 README: point to Documentation/SubmittingPatches
8086 Michael Haggerty (2):
8087 post-receive-email: remove unused variable
8088 post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
8090 Michael J Gruber (1):
8091 t0300: work around bug in dash 0.5.6
8093 Michał Kiedrowicz (1):
8094 grep -P: Fix matching ^ and $
8096 Nguyễn Thái Ngọc Duy (2):
8097 rev-list: remove BISECT_SHOW_TRIED flag
8098 rev-list: fix --verify-objects --quiet becoming --objects
8101 git-p4: set useClientSpec variable on initial clone
8102 git-p4: fix submit regression with clientSpec and subdir clone
8103 git-p4: remove bash-ism in t9809
8104 git-p4: remove bash-ism in t9800
8106 Philip Jägenstedt (1):
8107 remote: fix set-branches usage and documentation
8109 Stefano Lattarini (1):
8110 tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
8113 merge: add instructions to the commit message when editing
8114 bundle: put strbuf_readline_fd in strbuf.c with adjustments
8115 bundle: use a strbuf to scan the log for boundary commits
8116 strbuf: improve strbuf_get*line documentation
8117 t5704: match tests to modern style
8118 fast-import: zero all of 'struct tag' to silence valgrind
8121 CodingGuidelines: Add a note about spaces after redirection
8122 CodingGuidelines: do not use 'which' in shell scripts
8125 t5512 (ls-remote): modernize style
8128 Version v1.7.9.2; changes since v1.7.9.1:
8129 -----------------------------------------
8131 Christian Hammerl (1):
8132 completion: Allow dash as the first character for __git_ps1
8134 Clemens Buchacher (4):
8135 git rev-list: fix invalid typecast
8136 push/fetch/clone --no-progress suppresses progress output
8137 t5541: check error message against the real port number used
8138 do not override receive-pack errors
8140 Felipe Contreras (3):
8141 completion: work around zsh option propagation bug
8142 completion: use ls -1 instead of rolling a loop to do that ourselves
8143 completion: simplify __gitcomp and __gitcomp_nl implementations
8146 gitweb: Allow UTF-8 encoded CGI query parameters and path_info
8147 gitweb: Fix 'grep' search for multiple matches in file
8150 grep: make locking flag global
8151 grep: move sha1-reading mutex into low-level code
8152 grep: refactor the concept of "grep source" into an object
8153 convert git-grep to use grep_source interface
8154 grep: drop grep_buffer's "name" parameter
8155 grep: cache userdiff_driver in grep_source
8156 grep: respect diff attributes for binary-ness
8157 grep: load file data after checking binary-ness
8158 grep: pre-load userdiff drivers when threaded
8159 standardize and improve lookup rules for external local repos
8160 prompt: clean up strbuf usage
8161 prompt: fall back to terminal if askpass fails
8164 i18n: git-commit whence_s "merge/cherry-pick" message
8165 i18n: format_tracking_info "Your branch is behind" message
8168 Makefile: fix syntax for older make
8171 mailmap: always return a plain mail address from map_user()
8172 git checkout -b: allow switching out of an unborn branch
8173 commit: ignore intent-to-add entries instead of refusing
8174 diff --stat: show bars of same length for paths with same amount of changes
8175 Update draft release notes to 1.7.9.2
8176 Update draft release notes to 1.7.9.2
8177 Update draft release notes to 1.7.9.2
8181 fsck: give accurate error message on empty loose object files
8184 ctype.c only wants git-compat-util.h
8185 ctype: implement islower/isupper macro
8187 Nguyễn Thái Ngọc Duy (3):
8188 sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()
8189 find_pack_entry(): do not keep packed_git pointer locally
8190 Use correct grammar in diffstat summary line
8192 Philip Jägenstedt (2):
8193 completion: remove stale "to submit patches" documentation
8194 completion: use tabs for indentation
8197 completion: --edit-description option for git-branch
8198 completion: --list option for git-branch
8201 Fix build problems related to profile-directed optimization
8203 Zbigniew Jędrzejewski-Szmek (2):
8204 pager: find out the terminal width before spawning the pager
8205 man: rearrange git synopsis to fit in 80 lines
8208 Makefile: introduce CHARSET_LIB to link with -lcharset
8211 Version v1.7.9.1; changes since v1.7.9:
8212 ---------------------------------------
8215 completion: --edit and --no-edit for git-merge
8218 grep: fix -l/-L interaction with decoration lines
8221 Drop system includes from inet_pton/inet_ntop compatibility wrappers
8223 Clemens Buchacher (2):
8224 fix push --quiet: add 'quiet' capability to receive-pack
8225 dashed externals: kill children on exit
8228 mergetool: Provide an empty file when needed
8231 git.spec: Workaround localized messages not put in any RPM
8234 run-command: optionally kill children on exit
8235 imap-send: remove dead code
8236 tag: fix output of "tag -n" when errors occur
8237 tag: die when listing missing or corrupt objects
8240 submodule add: fix breakage when re-adding a deep submodule
8242 Johannes Schindelin (1):
8243 add -e: do not show difference in a submodule that is merely dirty
8245 Junio C Hamano (15):
8246 server_supports(): parse feature list more carefully
8247 Making pathspec limited log play nicer with --first-parent
8248 request-pull: explicitly ask tags/$name to be pulled
8249 tests: add write_script helper function
8250 parse_date(): allow ancient git-timestamp
8251 parse_date(): '@' prefix forces git-timestamp
8252 merge: do not create a signed tag merge under --ff-only option
8253 branch --edit-description: protect against mistyped branch name
8256 tag: do not show non-tag contents with "-n"
8257 merge: do not launch an editor on "--no-edit $tag"
8258 Update draft release notes to 1.7.9.1
8259 Update draft release notes to 1.7.9.1
8262 Michael J Gruber (1):
8263 t5541: avoid TAP test miscounting
8265 Michael Palimaka (1):
8266 Explicitly set X to avoid potential build breakage
8268 Shawn O. Pearce (1):
8269 remote-curl: Fix push status report when all branches fail
8271 Ævar Arnfjörð Bjarmason (3):
8272 Makefile: Change the default compiler from "gcc" to "cc"
8273 Remove Git's support for smoke testing
8274 t: use sane_unset instead of unset
8277 Version v1.7.9; changes since v1.7.9-rc2:
8278 -----------------------------------------
8280 Felipe Contreras (1):
8281 git-completion: workaround zsh COMPREPLY bug
8284 docs: minor grammar fixes for v1.7.9 release notes
8287 INSTALL: warn about recent Fedora breakage
8290 Michael Haggerty (1):
8291 Fix typo in 1.7.9 release notes
8294 Version v1.7.9-rc2; changes since v1.7.9-rc1:
8295 ---------------------------------------------
8298 gitweb: Fix file links in "grep" search
8299 gitweb: Harden "grep" search against filenames with ':'
8302 unix-socket: handle long socket pathnames
8303 credential-cache: report more daemon connection errors
8304 credential-cache: ignore "connection refused" errors
8306 Jonathan Nieder (1):
8307 unix-socket: do not let close() or chdir() clobber errno during cleanup
8310 pulling signed tag: add howto document
8315 Michael Haggerty (2):
8316 git-show-ref: fix escaping in asciidoc source
8317 git-show-ref doc: typeset regexp in fixed width font
8319 Nguyễn Thái Ngọc Duy (3):
8320 Document limited recursion pathspec matching with wildcards
8321 diff-index: enable recursive pathspec matching in unpack_trees
8322 diff-index: enable recursive pathspec matching in unpack_trees
8325 word-diff: ignore '\ No newline at eof' marker
8328 Version v1.7.9-rc1; changes since v1.7.9-rc0:
8329 ---------------------------------------------
8332 Use perl instead of sed for t8006-blame-textconv test
8334 Carlos Martín Nieto (1):
8335 archive: re-allow HEAD:Documentation on a remote invocation
8337 Clemens Buchacher (1):
8338 credentials: unable to connect to cache daemon
8341 send-email: multiedit is a boolean config option
8342 attr: don't confuse prefixes with leading directories
8343 attr: drop misguided defensive coding
8344 attr: fix leak in free_attr_elem
8345 thin-pack: try harder to use preferred base objects as base
8347 Junio C Hamano (11):
8348 attr.c: make bootstrap_attr_stack() leave early
8349 attr.c: clarify the logic to pop attr_stack
8350 Documentation: rerere's rr-cache auto-creation and rerere.enabled
8354 request-pull: use the real fork point when preparing the message
8355 Update draft release notes to 1.7.6.6
8356 Update draft release notes to 1.7.7.6
8357 Update draft release notes to 1.7.8.4
8361 gitweb: accept trailing "/" in $project_list
8363 Michael Haggerty (3):
8364 receive-pack: move more work into write_head_info()
8365 show_ref(): remove unused "flag" and "cb_data" arguments
8366 write_head_info(): handle "extra refs" locally
8368 Nguyễn Thái Ngọc Duy (1):
8369 t2203: fix wrong commit command
8371 Sebastian Schuberth (2):
8372 t9200: On MSYS, do not pass Windows-style paths to CVS
8373 git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
8376 mailinfo documentation: accurately describe non -k case
8379 Version v1.7.9-rc0; changes since v1.7.8.6:
8380 -------------------------------------------
8383 gitk: Remove unused $cdate array
8384 gitk: Remember time zones from author and commit timestamps
8387 git-gui: fix multi selected file operation
8388 git-gui: handle config booleans without value
8389 git-gui: add smart case search mode in searchbar
8390 git-gui: add regexp search mode to the searchbar
8391 git-gui: add search history to searchbar
8392 git-gui: fix unintended line break in message string
8393 git-gui: use "untracked" for files which are not known to git
8394 git-gui: new config to control staging of untracked files
8395 git-gui: fix display of path in browser title
8396 git-gui: use a tristate to control the case mode in the searchbar
8397 git-gui: span widgets over the full file output area in the blame view
8398 git-gui: include the file path in guitools confirmation dialog
8399 git-gui: make config gui.warndetachedcommit a boolean
8400 git-gui: don't warn for detached head when rebasing
8403 git-gui: fix spelling error in sshkey.tcl
8406 git-p4: ensure submit clientPath exists before chdir
8407 git-p4: use absolute directory for PWD env var
8408 git-p4: fix test for unsupported P4 Client Views
8409 git-p4: sort client views by reverse View number
8410 git-p4: support single file p4 client view maps
8413 Add built-in diff patterns for MATLAB code
8416 gitweb: Refactor diff body line classification
8417 gitweb: Extract formatting of diff chunk header
8418 gitweb: Give side-by-side diff extra CSS styling
8419 t9500: Add test for handling incomplete lines in diff by gitweb
8420 t9500: Add basic sanity tests for side-by-side diff in gitweb
8421 gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
8424 prune: handle --progress/no-progress
8425 reachable: per-object progress
8426 upload-archive: use start_command instead of fork
8427 test-lib: add test_config_global variant
8429 introduce credentials API
8430 credential: add function for parsing url components
8431 http: use credential API to get passwords
8432 credential: apply helper config
8433 credential: add credential.*.username
8434 credential: make relevance of http path configurable
8435 docs: end-user documentation for the credential subsystem
8436 credentials: add "cache" helper
8437 strbuf: add strbuf_add*_urlencode
8438 imap-send: avoid buffer overflow
8439 imap-send: don't check return value of git_getpass
8440 move git_getpass to its own source file
8441 refactor git_getpass into generic prompt function
8442 add generic terminal prompt function
8443 credentials: add "store" helper
8444 prompt: use git_terminal_prompt
8445 t: add test harness for external credential helpers
8446 credential: use git_prompt instead of git_getpass
8447 Makefile: linux has /dev/tty
8448 Makefile: OS X has /dev/tty
8449 contrib: add credential helper for OS X Keychain
8450 test-lib: redirect stdin of tests
8451 pretty: give placeholders to reflog identity
8454 write first for-merge ref to FETCH_HEAD first
8457 Makefile: unix sockets may not available on some platforms
8459 Jonathan Nieder (6):
8460 gitk: Make vi-style keybindings more vi-like
8461 test: add missing "&&" after echo command
8462 test: remove a porcelain test that hard-codes commit names
8463 t7501 (commit): modernize style
8464 test: commit --amend should honor --no-edit
8465 test: errors preparing for a test are not special
8468 stash: Don't fail if work dir contains file named 'HEAD'
8470 Junio C Hamano (50):
8471 branch: add read_branch_desc() helper function
8472 format-patch: use branch description in cover letter
8473 branch: teach --edit-description option
8474 request-pull: modernize style
8475 request-pull: state what commit to expect
8476 request-pull: use the branch description
8477 fmt-merge-msg: use branch.$name.description
8478 write_pack_header(): a helper function
8479 create_tmp_packfile(): a helper function
8480 finish_tmp_packfile(): a helper function
8481 Split GPG interface into its own helper library
8482 merge: notice local merging of tags and keep it unwrapped
8483 fetch: allow "git fetch $there v1.0" to fetch a tag
8484 refs DWIMmery: use the same rule for both "git fetch" and others
8485 fmt-merge-msg: avoid early returns
8486 fmt-merge-msg: package options into a structure
8487 fmt-merge-msg: Add contents of merged tag in the merge message
8488 merge: make usage of commit->util more extensible
8489 merge: record tag objects without peeling in MERGE_HEAD
8490 request-pull: use the annotated tag contents
8491 commit: copy merged signed tags to headers of merge commit
8492 merge: force edit and no-ff mode when merging a tag object
8493 commit: teach --amend to carry forward extra headers
8494 commit-tree: update the command line parsing
8495 commit-tree: teach -m/-F options to read logs from elsewhere
8496 commit: teach --gpg-sign option
8497 log: --show-signature
8498 test "commit -S" and "log --show-signature"
8499 pretty: %G[?GS] placeholders
8500 gpg-interface: allow use of a custom GPG binary
8501 csum-file: introduce sha1file_checkpoint
8502 bulk-checkin: replace fast-import based implementation
8503 Kick-off the 1.7.9 cycle
8504 commit: honour --no-edit
8505 Update draft release notes for 1.7.9
8506 Update draft release notes to 1.7.9
8507 request-pull: update the "pull" command generation logic
8508 Update draft release notes to 1.7.9
8509 request-pull: do not emit "tag" before the tagname
8510 Update draft release notes to 1.7.9
8511 commit: do not lose mergetag header when not amending
8512 Update draft release notes to 1.7.9
8513 Update draft release notes in preparation for 1.7.9-rc0
8514 Update draft release notes to 1.7.9
8515 verify_signed_buffer: fix stale comment
8516 commit --amend -S: strip existing gpgsig headers
8517 log-tree.c: small refactor in show_signature()
8518 log-tree: show mergetag in log --show-signature output
8519 log --show-signature: reword the common two-head merge case
8523 gitweb: Add a feature to show side-by-side diff
8524 gitweb: Add navigation to select side-by-side diff
8526 Kirill A. Shutemov (1):
8527 git-tag: introduce --cleanup option
8530 fetch: do not store peeled tag object names in FETCH_HEAD
8532 Martin von Zweigbergk (10):
8533 gitk: Fix file highlight when run in subdirectory
8534 gitk: Fix "show origin of this line" with separate work tree
8535 gitk: Fix "blame parent commit" with separate work tree
8536 gitk: Fix "External diff" with separate work tree
8537 gitk: Put temporary directory inside .git
8538 gitk: Run 'git rev-parse --git-dir' only once
8539 gitk: Simplify calculation of gitdir
8540 gitk: Show modified files with separate work tree
8541 t3401: modernize style
8542 t3401: use test_commit in setup
8544 Michael Haggerty (16):
8545 struct ref_entry: document name member
8546 refs: rename "refname" variables
8547 refs: rename parameters result -> sha1
8548 clear_ref_array(): rename from free_ref_array()
8549 is_refname_available(): remove the "quiet" argument
8550 parse_ref_line(): add docstring
8551 add_ref(): add docstring
8552 is_dup_ref(): extract function from sort_ref_array()
8553 refs: change signatures of get_packed_refs() and get_loose_refs()
8554 get_ref_dir(): change signature
8555 resolve_gitlink_ref(): improve docstring
8556 Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
8557 resolve_gitlink_ref_recursive(): change to work with struct ref_cache
8558 repack_without_ref(): remove temporary
8559 create_ref_entry(): extract function from add_ref()
8560 add_ref(): take a (struct ref_entry *) parameter
8562 Nguyễn Thái Ngọc Duy (14):
8563 fsck: return error code when verify_pack() goes wrong
8564 verify_packfile(): check as many object as possible in a pack
8565 fsck: avoid reading every object twice
8566 fsck: print progress
8567 prune: show progress while marking reachable objects
8568 Convert many resolve_ref() calls to read_ref*() and ref_exists()
8569 checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
8570 Copy resolve_ref() return value for longer use
8571 revert: convert resolve_ref() to read_ref_full()
8572 Convert resolve_ref+xstrdup to new resolve_refdup function
8573 Rename resolve_ref() to resolve_ref_unsafe()
8574 merge: abort if fails to commit
8575 Convert commit_tree() to take strbuf as message
8576 commit_tree(): refuse commit messages that contain NULs
8579 git-gui: include the number of untracked files to stage when asking the user
8580 git-gui: theme the search and line-number entry fields on blame screen
8581 git-gui: catch invalid or complete regular expressions and treat as no match.
8582 git-gui: enable the smart case sensitive search only if gui.search.smartcase is true
8583 git-gui: set suitable extended window manager hints.
8584 git-gui: support underline style when parsing diff output
8585 git-gui: sort the numeric ansi codes
8586 git-gui: set whitespace warnings appropriate to this project
8587 git-gui: added config gui.gcwarning to disable the gc hint message
8588 git-gui: handle shell script text filters when loading for blame.
8592 gitk: Update copyright
8595 git-p4: introduce skipSubmitEdit
8596 git-p4: submit test for auto-creating clientPath
8597 git-p4: test for absolute PWD problem
8598 git-p4: fix skipSubmitEdit regression
8600 git-p4: introduce asciidoc documentation
8601 git-p4: clone does not use --git-dir
8602 git-p4: test cloning with two dirs, clarify doc
8603 git-p4: document and test clone --branch
8604 git-p4: honor --changesfile option and test
8605 git-p4: document and test --import-local
8606 git-p4: test --max-changes
8607 git-p4: test --keep-path
8608 git-p4: test and document --use-client-spec
8609 git-p4: document and test submit options
8610 git-p4: test client view handling
8611 git-p4: rewrite view handling
8612 git-p4: view spec documentation
8614 Ramkumar Ramachandra (11):
8615 t3200 (branch): fix '&&' chaining
8616 test: fix '&&' chaining
8617 t3030 (merge-recursive): use test_expect_code
8618 t1510 (worktree): fix '&&' chaining
8619 t3040 (subprojects-basic): fix '&&' chaining, modernize style
8620 revert: free msg in format_todo()
8621 revert: make commit subjects in insn sheet optional
8622 revert: tolerate extra spaces, tabs in insn sheet
8623 revert: simplify getting commit subject in format_todo()
8624 t3510 (cherry-pick-sequencer): use exit status
8625 t3502, t3510: clarify cherry-pick -m failure
8627 Ramsay Allan Jones (3):
8628 builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
8629 environment.c: Fix an sparse "symbol not declared" warning
8630 fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
8632 Raphael Zimmerer (1):
8633 gitk: When a commit contains a note, mark it with a yellow box
8636 read-cache.c: allocate index entries individually
8637 cache.h: put single NUL at end of struct cache_entry
8638 use struct sha1_array in diff_tree_combined()
8639 pass struct commit to diff_tree_combined_merge()
8640 submodule: use diff_tree_combined_merge() instead of diff_tree_combined()
8643 completion: document __gitcomp()
8644 completion: optimize refs completion
8645 completion: make refs completion consistent for local and remote repos
8646 completion: improve ls-remote output filtering in __git_refs()
8647 completion: support full refs from remote repositories
8648 completion: query only refs/heads/ in __git_refs_remotes()
8649 completion: improve ls-remote output filtering in __git_refs_remotes()
8650 completion: fast initial completion for config 'remote.*.fetch' value
8651 completion: remove broken dead code from __git_heads() and __git_tags()
8654 git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming.
8657 git-svn.perl: close the edit for propedits even with no mods
8660 grep: load funcname patterns for -W
8661 grep: enable threading with -p and -W using lazy attribute lookup
8662 grep: disable threading in non-worktree case
8663 test-terminal: set output terminals to raw mode
8664 bash completion: use read -r everywhere
8667 git-gui: add config value gui.diffopts for passing additional diff options
8669 Vincent van Ravesteijn (4):
8670 Compile fix for MSVC: Do not include sys/resources.h
8671 Compile fix for MSVC: Include <io.h>
8672 MSVC: Remove unneeded header stubs
8673 Show error for 'git merge' with unset merge.defaultToUpstream
8676 gitk: Make "touching paths" search support backslashes
8678 Ævar Arnfjörð Bjarmason (5):
8679 pull: introduce a pull.rebase option to enable --rebase
8680 i18n: add infrastructure for translating Git with gettext
8681 Fix an enum assignment issue spotted by Sun Studio
8682 Fix a bitwise negation assignment issue spotted by Sun Studio
8683 Appease Sun Studio by renaming "tmpfile"
8686 Version v1.7.8.6; changes since v1.7.8.5:
8687 -----------------------------------------
8689 Carlos Martín Nieto (1):
8690 Documentation: use {asterisk} in rev-list-options.txt when needed
8692 Clemens Buchacher (1):
8693 t5541: check error message against the real port number used
8696 Documentation/gitweb: trivial English fixes
8699 gitweb: Fix actionless dispatch for non-existent objects
8702 t0090: be prepared that 'wc -l' writes leading blanks
8704 Jonathan Nieder (1):
8705 bundle: remove stray single-quote from error message
8708 i18n of multi-line advice messages
8709 fetch/receive: remove over-pessimistic connectivity check
8714 t/Makefile: Use $(sort ...) explicitly where needed
8717 rerere: Document 'rerere remaining'
8719 Shawn O. Pearce (1):
8720 remote-curl: Fix push status report when all branches fail
8723 Add test-scrap-cache-tree
8724 Test the current state of the cache-tree optimization
8725 Refactor cache_tree_update idiom from commit
8726 commit: write cache-tree data when writing index anyway
8727 reset: update cache-tree data when appropriate
8728 bundle: put strbuf_readline_fd in strbuf.c with adjustments
8729 bundle: use a strbuf to scan the log for boundary commits
8730 strbuf: improve strbuf_get*line documentation
8731 t5704: match tests to modern style
8732 t5510: refactor bundle->pack conversion
8733 t5510: ensure we stay in the toplevel test dir
8734 bundle: keep around names passed to add_pending_object()
8735 Document the --histogram diff option
8738 Version v1.7.8.5; changes since v1.7.8.4:
8739 -----------------------------------------
8742 rebase -m: only call "notes copy" when rewritten exists and is non-empty
8744 Dmitry V. Levin (1):
8745 Makefile: add thread-utils.h to LIB_H
8748 imap-send: remove dead code
8751 am: don't infloop for an empty input file
8757 Michał Kiedrowicz (1):
8758 grep -P: Fix matching ^ and $
8761 Version v1.7.8.4; changes since v1.7.8.3:
8762 -----------------------------------------
8765 send-email: multiedit is a boolean config option
8766 attr: don't confuse prefixes with leading directories
8767 attr: drop misguided defensive coding
8768 attr: fix leak in free_attr_elem
8769 thin-pack: try harder to use preferred base objects as base
8771 Junio C Hamano (11):
8772 attr.c: make bootstrap_attr_stack() leave early
8773 attr.c: clarify the logic to pop attr_stack
8774 Documentation: rerere's rr-cache auto-creation and rerere.enabled
8778 Update draft release notes to 1.7.6.6
8779 Update draft release notes to 1.7.7.6
8780 Update draft release notes to 1.7.8.4
8784 Nguyễn Thái Ngọc Duy (2):
8785 t2203: fix wrong commit command
8786 diff-index: enable recursive pathspec matching in unpack_trees
8789 Version v1.7.8.3; changes since v1.7.8.2:
8790 -----------------------------------------
8793 fix hang in git fetch if pointed at a 0 length bundle
8795 Clemens Buchacher (2):
8796 Documentation: read-tree --prefix works with existing subtrees
8797 t5550: repack everything into one file
8800 Add MYMETA.json to perl/.gitignore
8803 gitweb: Fix fallback mode of to_utf8 subroutine
8806 docs: describe behavior of relative submodule URLs
8811 Jürgen Kreileder (3):
8812 gitweb: Call to_utf8() on input string in chop_and_escape_str()
8813 gitweb: esc_html() site name for title in OPML
8814 gitweb: Output valid utf8 in git_blame_common('data')
8816 Nguyễn Thái Ngọc Duy (1):
8817 Catch invalid --depth option passed to clone or fetch
8820 Documentation: rerere.enabled is the primary way to configure rerere
8823 Version v1.7.8.2; changes since v1.7.8.1:
8824 -----------------------------------------
8827 rebase -i: interrupt rebase when "commit --amend" failed during "reword"
8830 Update documentation for stripspace
8833 enable SO_KEEPALIVE for connected TCP sockets
8836 compat/setenv.c: update errno when erroring out
8837 compat/setenv.c: error if name contains '='
8840 read-cache: let refresh_cache_ent pass up changed flags
8841 refresh_index: rename format variables
8842 refresh_index: make porcelain output more specific
8843 compat/snprintf: don't look at va_list twice
8844 docs: mention "-k" for both forms of "git mv"
8845 mv: honor --verbose flag
8846 mv: make non-directory destination error more clear
8847 mv: improve overwrite warning
8848 mv: be quiet about overwriting
8849 drop "match" parameter from get_remote_heads
8850 t5500: give fully-qualified refs to fetch-pack
8851 fetch-pack: match refs exactly
8852 connect.c: drop path_match function
8853 t5540: test DAV push with authentication
8854 http-push: enable "proactive auth"
8855 use custom rename score during --follow
8856 docs: brush up obsolete bits of git-fsck manpage
8857 make "git push -v" actually verbose
8858 commit, merge: initialize static strbuf
8859 remote-curl: don't pass back fake refs
8861 Jelmer Vernooij (1):
8862 Fix an incorrect reference to --set-all.
8865 t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
8866 t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
8867 fast-import: Fix incorrect fanout level when modifying existing notes refs
8870 Compatibility: declare strtoimax() under NO_STRTOUMAX
8872 Jonathan Nieder (9):
8873 branch: allow a no-op "branch -M <current-branch> HEAD"
8874 Allow checkout -B <current-branch> to update the current branch
8875 revert: give --continue handling its own function
8876 revert: allow cherry-pick --continue to commit before resuming
8877 revert: pass around rev-list args in already-parsed form
8878 revert: allow single-pick in the middle of cherry-pick sequence
8879 revert: do not remove state until sequence is finished
8880 Revert "reset: Make reset remove the sequencer state"
8881 revert: stop creating and removing sequencer-old directory
8884 checkout -m: no need to insist on having all 3 stages
8885 checkout_merged(): squelch false warning from some gcc
8886 lf_to_crlf_filter(): resurrect CRLF->CRLF hack
8887 advice: Document that they all default to true
8891 Add strtoimax() compatibility function.
8892 Support sizes >=2G in various config options accepting 'g' sizes.
8895 Test 'checkout -m -- path'
8898 imap-send: Remove unused 'use_namespace' variable
8901 git-sh-setup: make require_clean_work_tree part of the interface
8903 Ævar Arnfjörð Bjarmason (1):
8904 t/t2023-checkout-m.sh: fix use of test_must_fail
8907 Version v1.7.8.1; changes since v1.7.8:
8908 ---------------------------------------
8911 t/t4131-apply-fake-ancestor.sh: fix broken test
8912 builtin/apply.c: report error on failure to recognize input
8914 Carlos Martín Nieto (2):
8915 convert: track state in LF-to-CRLF filter
8916 clone: the -o option has nothing to do with <branch>
8919 mingw: give waitpid the correct signature
8922 Documentation: fix formatting error in merge-options.txt
8925 http: drop "local" member from request struct
8926 archive: don't let remote clients get unreachable commits
8927 stripspace: fix outdated comment
8928 fetch: create status table using strbuf
8929 blame: don't overflow time buffer
8932 diff/status: print submodule path when looking for changes fails
8935 get_tree_entry(): do not call find_tree_entry() on an empty tree
8936 unpack_object_header_buffer(): clear the size field upon error
8937 receive-pack, fetch-pack: reject bogus pack that records objects twice
8938 pack-object: tolerate broken packs that have duplicated objects
8941 Update draft release notes for 1.7.8.1
8942 lf_to_crlf_filter(): tell the caller we added "\n" when draining
8945 Martin von Zweigbergk (1):
8946 am: don't persist keepcr flag
8948 Michael Haggerty (1):
8949 git symbolic-ref: documentation fix
8951 Michael Schubert (2):
8952 builtin/commit: add missing '/' in help message
8953 builtin/log: remove redundant initialization
8956 http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
8957 http.c: Use timeout suggested by curl instead of fixed 50ms timeout
8958 http.c: Rely on select instead of tracking whether data was received
8960 Nguyễn Thái Ngọc Duy (5):
8961 tree-walk.c: do not leak internal structure in tree_entry_len()
8962 read_directory_recursive: reduce one indentation level
8963 tree_entry_interesting(): give meaningful names to return values
8964 tree_entry_interesting: make use of local pointer "item"
8965 checkout,merge: loosen overwriting untracked file check based on info/exclude
8968 Add MYMETA.yml to perl/.gitignore
8971 userdiff: allow * between cpp funcname words
8973 Ævar Arnfjörð Bjarmason (3):
8974 apply: get rid of useless x < 0 comparison on a size_t type
8975 cast variable in call to free() in builtin/diff.c and submodule.c
8976 builtin/init-db.c: eliminate -Wformat warning on Solaris
8979 Version v1.7.8; changes since v1.7.8-rc4:
8980 -----------------------------------------
8986 Version v1.7.8-rc4; changes since v1.7.8-rc3:
8987 ---------------------------------------------
8990 Fix revert --abort on Windows
8992 Jonathan Nieder (11):
8993 do not let git_path clobber errno when reporting errors
8994 notes merge: eliminate OUTPUT macro
8995 Makefile: add missing header file dependencies
8996 Makefile: add option to disable automatic dependency generation
8997 revert: rename --reset option to --quit
8998 revert: rearrange pick_revisions() for clarity
8999 revert: improve error message for cherry-pick during cherry-pick
9000 revert: write REVERT_HEAD pseudoref during conflicted revert
9001 revert: introduce --abort to cancel a failed cherry-pick
9002 revert: remove --reset compatibility option
9003 revert --abort: do not leave behind useless sequencer-old directory
9006 name-rev --all: do not even attempt to describe non-commit object
9008 Hopefully final update of release notes before 1.7.8 final
9009 Update 1.7.8 draft release notes in preparation for rc4
9012 Marc-André Lureau (1):
9013 mailmap: xcalloc mailmap_info
9015 Nguyễn Thái Ngọc Duy (1):
9016 revert: do not pass non-literal string as format to git_path()
9018 Ramkumar Ramachandra (4):
9019 http: remove unused function hex()
9020 convert: don't mix enum with int
9021 sha1_file: don't mix enum with int
9022 git-compat-util: don't assume value for undefined variable
9024 Ramsay Allan Jones (3):
9025 t5501-*.sh: Fix url passed to clone in setup test
9026 config.c: Fix a static buffer overwrite bug by avoiding mkpath()
9027 convert.c: Fix return type of git_path_check_eol()
9029 Thomas Hochstein (1):
9030 documentation fix: git difftool uses diff tools, not merge tools.
9032 Vincent van Ravesteijn (2):
9033 builtin-branch: Fix crash on invalid use of --force
9034 builtin-reset: Documentation update
9037 Version v1.7.8-rc3; changes since v1.7.8-rc2:
9038 ---------------------------------------------
9041 Revert "upload-archive: use start_command instead of fork"
9042 refs: loosen over-strict "format" check
9045 Ramkumar Ramachandra (1):
9046 revert: prettify fatal messages
9049 Version v1.7.8-rc2; changes since v1.7.8-rc1:
9050 ---------------------------------------------
9052 Felipe Contreras (1):
9053 remote: fix remote set-url usage
9056 docs: don't mention --quiet or --exit-code in git-log(1)
9059 remote: fix set-branches usage
9060 docs: Update install-doc-quick
9062 Update draft release notes to 1.7.8
9066 mktree: fix a memory leak in write_tree()
9069 completion: don't leak variable from the prompt into environment
9072 Version v1.7.8-rc1; changes since v1.7.8-rc0:
9073 ---------------------------------------------
9076 pack-objects: mark add_to_write_order() as inline
9077 pack-objects: use unsigned int for counter and offset values
9078 pack-objects: rewrite add_descendants_to_write_order() iteratively
9079 pack-objects: don't traverse objects unnecessarily
9082 mingw: move poll out of sys-folder
9083 compat/win32/poll.c: upgrade from upstream
9084 upload-archive: use start_command instead of fork
9085 mingw: poll.h is no longer in sys/
9088 name-hash.c: always initialize dir_next pointer
9091 (squash) test for previous
9093 Update draft release notes to 1.7.8
9094 receive-pack: do not expect object 0{40} to exist
9097 Nguyễn Thái Ngọc Duy (2):
9098 pretty.c: free get_header() return value
9099 pretty.c: use original commit message if reencoding fails
9102 t7511: avoid use of reserved filename on Windows.
9105 git-p4: ignore apple filetype
9107 Sebastian Schuberth (2):
9108 blame.c: Properly initialize strbuf after calling, textconv_object()
9109 blame.c: Properly initialize strbuf after calling textconv_object(), again
9112 t3200: add test case for 'branch -m'
9113 http: don't always prompt for password
9116 branch -m: handle no arg properly
9119 svn: Quote repository root in regex match
9121 Ævar Arnfjörð Bjarmason (2):
9122 t/t6030-bisect-porcelain.sh: use test_i18ngrep
9123 t/t7508-status.sh: use test_i18ncmp
9126 Version v1.7.8-rc0; changes since v1.7.7.7:
9127 -------------------------------------------
9130 grep: do not use --index in the short usage output
9131 grep --no-index: don't use git standard exclusions
9132 git-gui: search and linenumber input are mutual exclusive in the blame view
9133 git-gui: only accept numbers in the goto-line input
9134 git-gui: clear the goto line input when hiding
9135 git-gui: incremental goto line in blame view
9136 grep: fix the error message that mentions --exclude
9139 submodule: Demonstrate known breakage during recursive merge
9140 submodule: Search for merges only at end of recursive merge
9143 t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
9144 git-stash.sh: fix typo in error message
9145 t/t3905: add missing '&&' linkage
9146 git-stash: remove untracked/ignored directories when stashed
9147 refs.c: ensure struct whose member may be passed to realloc is initialized
9148 refs.c: abort ref search if ref array is empty
9149 refs.c: free duplicate entries in the ref array instead of leaking them
9150 t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script
9152 Carlos Martín Nieto (1):
9153 Documentation: update [section.subsection] to reflect what git does
9156 git-web--browse: avoid the use of eval
9158 Christoffer Pettersson (1):
9159 git-gui: Corrected a typo in the Swedish translation of 'Continue'
9161 Clemens Buchacher (5):
9162 remove prefix argument from pathspec_prefix
9163 rename pathspec_prefix() to common_prefix() and move to dir.[ch]
9164 send-email: add option -h
9165 use -h for synopsis and --help for manpage consistently
9166 use test number as port number
9169 Add Git::config_path()
9170 use new Git::config_path() for aliasesfile
9171 send-email: Fix %config_path_settings handling
9174 tree-walk: drop unused parameter from match_dir_prefix
9175 tree-walk: micro-optimization in tree_entry_interesting
9178 Makefile: Improve compiler header dependency check
9181 git-gui: Enable jumping to a specific line number in blame view.
9182 git-gui: Add keyboard shortcuts for search and goto commands in blame view.
9185 Fix typo: existant->existent
9186 fast-import: don't allow to tag empty branch
9187 fast-import: don't allow to note on empty branch
9190 gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
9193 enter_repo: do not modify input
9194 mingw: avoid using strbuf in syslog
9196 Fredrik Gustafsson (2):
9197 rev-parse: add option --resolve-git-dir <path>
9198 Move git-dir for submodules
9200 Fredrik Kuivinen (1):
9201 Makefile: Use computed header dependencies if the compiler supports it
9203 Frédéric Heitzmann (1):
9204 git svn dcommit: new option --interactive.
9206 Giuseppe Bilotta (1):
9207 am: preliminary support for hg patches
9210 git-gui: warn when trying to commit on a detached head
9211 submodule: move update configuration variable further up
9212 add update 'none' flag to disable update of submodule by default
9213 git-gui: deal with unknown files when pressing the "Stage Changed" button
9216 sha1_file: normalize alt_odb path before comparing and storing
9219 gitweb: Add gitweb(1) manpage for gitweb itself
9220 Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
9221 Documentation: Add gitweb config variables to git-config(1)
9222 gitweb: Add gitweb manpages to 'gitweb' package in git.spec
9223 Add simple test for Git::config_path() in t/t9700-perl-git.sh
9226 Teach '--cached' option to check-attr
9228 revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
9229 cherry-pick: do not give irrelevant advice when cherry-pick punted
9230 Teach merge the '[-e|--edit]' option
9233 url: decode buffers that are not NUL-terminated
9234 improve httpd auth tests
9235 remote-curl: don't retry auth failures with dumb protocol
9236 http: retry authentication failures for all http requests
9237 t7004: factor out gpg setup
9238 t6300: add more body-parsing tests
9239 for-each-ref: refactor subject and body placeholder parsing
9240 for-each-ref: handle multiline subjects like --pretty
9241 t3200: clean up checks for file existence
9242 fix phantom untracked files when core.ignorecase is set
9243 t1300: put git invocations inside test function
9244 t1300: test mixed-case variable retrieval
9245 pack-objects: protect against disappearing packs
9246 downgrade "packfile cannot be accessed" errors to warnings
9247 daemon: give friendlier error messages to clients
9248 http_init: accept separate URL parameter
9249 contrib: add diff highlight script
9250 tests: add missing executable bits
9251 contrib: add git-jump script
9252 completion: match ctags symbol names in grep patterns
9255 Add a remote helper to interact with mediawiki (fetch & push)
9257 Johannes Schindelin (5):
9258 Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile
9259 t1020: disable the pwd test on MinGW
9260 t9001: do not fail only due to CR/LF issues
9261 t9300: do not run --cat-blob-fd related tests on MinGW
9262 git grep: be careful to use mutexes only when they are initialized
9265 t1402-check-ref-format: skip tests of refs beginning with slash on Windows
9266 t1300: attempting to remove a non-existent .git/config is not an error
9268 Jonathan Nieder (3):
9269 ident: check /etc/mailname if email is unknown
9270 ident: do not retrieve default ident when unnecessary
9271 Makefile: fix permissions of mergetools/ checked out with permissive umask
9273 Julian Phillips (2):
9274 Don't sort ref_list too early
9275 refs: Use binary search to lookup refs faster
9277 Junio C Hamano (47):
9278 rev-list: fix finish_object() call
9279 revision.c: add show_object_with_name() helper function
9280 revision.c: update show_object_with_name() without using malloc()
9281 list-objects: pass callback data to show_objects()
9282 rev-list --verify-object
9283 fetch: verify we have everything we need before updating our ref
9284 fetch.fsckobjects: verify downloaded objects
9285 transfer.fsckobjects: unify fetch/receive.fsckobjects
9286 test: fetch/receive with fsckobjects
9287 consolidate pathspec_prefix and common_prefix
9288 fetch: verify we have everything we need before updating our ref
9289 check_everything_connected(): refactor to use an iterator
9290 check_everything_connected(): libify
9291 receive-pack: check connectivity before concluding "git push"
9292 builtin/revert.c: make commit_list_append() static
9293 refs.c: make create_cached_refs() static
9294 send-pack: typofix error message
9295 rename "match_refs()" to "match_push_refs()"
9296 Allow git merge ":/<pattern>"
9297 ls-remote: a lone "-h" is asking for help
9298 t0003: remove extra whitespaces
9299 parse-options: deprecate OPT_BOOLEAN
9300 archive.c: use OPT_BOOL()
9301 url.c: simplify is_url()
9302 grep: teach --untracked and --exclude-standard options
9303 Post 1.7.7 first wave
9304 Update draft release notes to 1.7.8
9305 refs.c: move dwim_ref()/dwim_log() from sha1_name.c
9306 Update draft release notes to 1.7.8
9307 bundle: allowing to read from an unseekable fd
9308 bundle: add parse_bundle_header() helper function
9309 Update draft release notes to 1.7.8
9310 t7800: avoid arithmetic expansion notation
9311 Update draft release notes to 1.7.8
9312 resolve_gitlink_packed_ref(): fix mismerge
9313 Update draft release notes to 1.7.8
9314 Makefile: ask "ls-files" to list source files if available
9315 libperl-git: refactor Git::config_*
9316 Update draft release notes to 1.7.8
9317 resolve_ref(): expose REF_ISBROKEN flag
9318 resolve_ref(): report breakage to the caller without warning
9319 Update draft release notes to 1.7.8
9320 builtin/grep: make lock/unlock into static inline functions
9321 builtin/grep: simplify lock_and_read_sha1_file()
9322 Update draft release notes to 1.7.8
9323 Update draft release notes to 1.7.8
9327 git-p4: handle files with shell metacharacters
9330 gitweb: provide a way to customize html headers
9333 git-remote-mediawiki: allow push to set MediaWiki metadata
9334 git-remote-mediawiki: trivial fixes
9335 git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
9336 git-remote-mediawiki: obey advice.pushNonFastForward
9337 git-remote-mediawiki: allow a domain to be set for authentication
9338 git-remote-mediawiki: don't include HTTP login/password in author
9340 Michael Haggerty (36):
9341 Extract a function clear_cached_refs()
9342 Access reference caches only through new function get_cached_refs()
9343 Change the signature of read_packed_refs()
9344 Allocate cached_refs objects dynamically
9345 Store the submodule name in struct cached_refs
9346 Retain caches of submodule refs
9347 get_sha1_hex(): do not read past a NUL character
9348 t1402: add some more tests
9349 git check-ref-format: add options --allow-onelevel and --refspec-pattern
9350 Change bad_ref_char() to return a boolean value
9351 Change check_ref_format() to take a flags argument
9352 Refactor check_refname_format()
9353 Do not allow ".lock" at the end of any refname component
9354 Make collapse_slashes() allocate memory for its result
9355 Inline function refname_format_print()
9356 Change check_refname_format() to reject unnormalized refnames
9357 resolve_ref(): explicitly fail if a symlink is not readable
9358 resolve_ref(): use prefixcmp()
9359 resolve_ref(): only follow a symlink that contains a valid, normalized refname
9360 resolve_ref(): turn buffer into a proper string as soon as possible
9361 resolve_ref(): extract a function get_packed_ref()
9362 resolve_ref(): do not follow incorrectly-formatted symbolic refs
9363 remote: use xstrdup() instead of strdup()
9364 remote: avoid passing NULL to read_ref()
9365 resolve_ref(): verify that the input refname has the right format
9366 resolve_ref(): emit warnings for improperly-formatted references
9367 resolve_ref(): also treat a too-long SHA1 as invalid
9368 resolve_ref(): expand documentation
9369 add_ref(): verify that the refname is formatted correctly
9370 invalidate_ref_cache(): rename function from invalidate_cached_refs()
9371 invalidate_ref_cache(): take the submodule as parameter
9372 invalidate_ref_cache(): expose this function in the refs API
9373 clear_ref_cache(): rename parameter
9374 clear_ref_cache(): extract two new functions
9375 write_ref_sha1(): only invalidate the loose ref cache
9376 clear_ref_cache(): inline function
9378 Michael J Gruber (7):
9379 t6040: test branch -vv
9380 git-tag: introduce long forms for the options
9381 git-branch: introduce missing long forms for the options
9382 branch: introduce --list option
9383 branch: allow pattern arguments
9384 branch: -v does not automatically imply --list
9385 http: use hostname in credential description
9387 Michael W. Olson (1):
9388 git-svn: Allow certain refs to be ignored
9391 for-each-ref: add split message parts to %(contents:*).
9393 Nguyễn Thái Ngọc Duy (6):
9394 sparse checkout: show error messages when worktree shaping fails
9395 Add explanation why we do not allow to sparse checkout to empty working tree
9396 pack-protocol: document "ERR" line
9397 daemon: return "access denied" if a service is not allowed
9398 daemon: log errors if we could not use some sockets
9399 t5403: convert leading spaces to tabs
9402 receive-pack: don't pass non-existent refs to post-{receive,update} hooks
9405 git-gui: updated translator README for current procedures.
9406 Fix tooltip display with multiple monitors on windows.
9407 git-gui: drop the 'n' and 'Shift-n' bindings from the last patch.
9408 mergetools: use the correct tool for Beyond Compare 3 on Windows
9409 mingw: ensure sockets are initialized before calling gethostname
9410 t9901: fix line-ending dependency on windows
9413 git-p4 tests: refactor and cleanup
9414 git-p4: handle utf16 filetype properly
9415 git-p4: recognize all p4 filetypes
9416 git-p4: stop ignoring apple filetype
9417 git-p4: keyword flattening fixes
9419 Peter Oberndorfer (1):
9420 "rebase -i": support special-purpose editor to edit insn sheet
9423 Learn to handle gitfiles in enter_repo
9424 Teach transport about the gitfile mechanism
9425 Add test showing git-fetch groks gitfiles
9427 Ramkumar Ramachandra (18):
9428 advice: Introduce error_resolve_conflict
9429 config: Introduce functions to write non-standard file
9430 revert: Simplify and inline add_message_to_msg
9431 revert: Don't check lone argument in get_encoding
9432 revert: Rename no_replay to record_origin
9433 revert: Eliminate global "commit" variable
9434 revert: Introduce struct to keep command-line options
9435 revert: Separate cmdline parsing from functional code
9436 revert: Don't create invalid replay_opts in parse_args
9437 revert: Save data for continuing after conflict resolution
9438 revert: Save command-line options for continuing operation
9439 revert: Make pick_commits functionally act on a commit list
9440 revert: Introduce --reset to remove sequencer state
9441 reset: Make reset remove the sequencer state
9442 revert: Remove sequencer state when no commits are pending
9443 revert: Don't implicitly stomp pending sequencer operation
9444 revert: Introduce --continue to continue the operation
9445 revert: Propagate errors upwards from do_pick_commit
9447 Ramsay Allan Jones (5):
9448 Makefile: Make dependency directory creation less noisy
9449 sparse: Fix an "Using plain integer as NULL pointer" warning
9450 obstack.c: Fix some sparse warnings
9451 Fix some "variable might be used uninitialized" warnings
9452 gitweb/Makefile: Remove static/gitweb.js in the clean target
9455 parseopt: add OPT_NOOP_NOARG
9456 revert: use OPT_NOOP_NOARG
9457 apply: use OPT_NOOP_NOARG
9458 checkout: check for "Previous HEAD" notice in t2020
9459 revision: factor out add_pending_sha1
9460 checkout: use add_pending_{object,sha1} in orphan check
9461 revision: add leak_pending flag
9462 bisect: use leak_pending flag
9463 bundle: use leak_pending flag
9464 checkout: use leak_pending flag
9465 commit: factor out clear_commit_marks_for_object_array
9467 test-ctype: add test for is_pathspec_magic
9468 name-rev: split usage string
9469 pickaxe: plug diff filespec leak with empty needle
9470 pickaxe: plug regex leak
9471 pickaxe: plug regex/kws leak
9472 pickaxe: factor out has_changes
9473 pickaxe: pass diff_options to contains and has_changes
9474 pickaxe: give diff_grep the same signature as has_changes
9475 pickaxe: factor out pickaxe
9476 xdiff: factor out get_func_line()
9477 diff: add option to show whole functions as context
9480 completion: unite --reuse-message and --reedit-message for 'notes'
9481 completion: unite --format and --pretty for 'log' and 'show'
9483 Sebastian Schuberth (2):
9484 git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
9485 inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables
9487 Sitaram Chamarty (1):
9488 git-difftool: allow skipping file by typing 'n' at prompt
9491 completion: fix issue with process substitution not working on Git for Windows
9494 fetch: plug two leaks on error exit in store_updated_refs
9495 submodule: whitespace fix
9496 submodule::module_clone(): silence die() message from module_name()
9498 Teemu Matilainen (3):
9499 completion: unite --reuse-message and --reedit-message handling
9500 completion: commit --fixup and --squash
9501 completion: push --set-upstream
9503 Zbigniew Jędrzejewski-Szmek (1):
9504 send-email: auth plain/login fix
9507 Version v1.7.7.7; changes since v1.7.7.6:
9508 -----------------------------------------
9511 imap-send: remove dead code
9513 Jonathan Nieder (1):
9514 bundle: remove stray single-quote from error message
9521 Document the --histogram diff option
9524 Version v1.7.7.6; changes since v1.7.7.5:
9525 -----------------------------------------
9527 Clemens Buchacher (1):
9528 Documentation: read-tree --prefix works with existing subtrees
9531 Add MYMETA.json to perl/.gitignore
9534 attr: don't confuse prefixes with leading directories
9535 attr: drop misguided defensive coding
9536 attr: fix leak in free_attr_elem
9537 thin-pack: try harder to use preferred base objects as base
9540 docs: describe behavior of relative submodule URLs
9543 attr.c: make bootstrap_attr_stack() leave early
9544 attr.c: clarify the logic to pop attr_stack
9545 Documentation: rerere's rr-cache auto-creation and rerere.enabled
9548 Update draft release notes to 1.7.6.6
9549 Update draft release notes to 1.7.7.6
9552 Nguyễn Thái Ngọc Duy (2):
9553 t2203: fix wrong commit command
9554 diff-index: enable recursive pathspec matching in unpack_trees
9557 Documentation: rerere.enabled is the primary way to configure rerere
9560 Version v1.7.7.5; changes since v1.7.7.4:
9561 -----------------------------------------
9564 mingw: give waitpid the correct signature
9567 stripspace: fix outdated comment
9568 fetch: create status table using strbuf
9569 blame: don't overflow time buffer
9575 Martin von Zweigbergk (1):
9576 am: don't persist keepcr flag
9578 Michael Haggerty (1):
9579 git symbolic-ref: documentation fix
9581 Nguyễn Thái Ngọc Duy (1):
9582 checkout,merge: loosen overwriting untracked file check based on info/exclude
9585 Add MYMETA.yml to perl/.gitignore
9587 Thomas Hochstein (1):
9588 documentation fix: git difftool uses diff tools, not merge tools.
9590 Ævar Arnfjörð Bjarmason (2):
9591 apply: get rid of useless x < 0 comparison on a size_t type
9592 cast variable in call to free() in builtin/diff.c and submodule.c
9595 Version v1.7.7.4; changes since v1.7.7.3:
9596 -----------------------------------------
9598 Jonathan Nieder (2):
9599 notes merge: eliminate OUTPUT macro
9600 Makefile: add missing header file dependencies
9603 name-rev --all: do not even attempt to describe non-commit object
9606 Marc-André Lureau (1):
9607 mailmap: xcalloc mailmap_info
9610 Version v1.7.7.3; changes since v1.7.7.2:
9611 -----------------------------------------
9614 pack-objects: mark add_to_write_order() as inline
9615 pack-objects: use unsigned int for counter and offset values
9616 pack-objects: rewrite add_descendants_to_write_order() iteratively
9617 pack-objects: don't traverse objects unnecessarily
9620 docs: don't mention --quiet or --exit-code in git-log(1)
9622 Julien Muchembled (1):
9623 gitweb: fix regression when filtering out forks
9626 branch -m/-M: remove undocumented RENAMED-REF
9627 docs: Update install-doc-quick
9631 Version v1.7.7.2; changes since v1.7.7.1:
9632 -----------------------------------------
9635 attr.c: avoid inappropriate access to strbuf "buf" member
9636 cleanup: use internal memory allocation wrapper functions everywhere
9637 builtin/mv.c: plug miniscule memory leak
9638 attr.c: respect core.ignorecase when matching attribute patterns
9640 Carlos Martín Nieto (6):
9641 Remove 'working copy' from the documentation and C code
9642 fetch: free all the additional refspecs
9643 t5510: add tests for fetch --prune
9644 remote: separate out the remote_find_tracking logic into query_refspecs
9645 fetch: honor the user-provided refspecs when pruning refs
9646 fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
9648 Christian Couder (1):
9649 bisect: fix exiting when checkout failed in bisect_start()
9652 date.c: Support iso8601 timezone formats
9655 gitweb: Strip non-printable characters from syntax highlighter output
9658 add sha1_array API docs
9659 quote.h: fix bogus comment
9660 refactor argv_array into generic code
9661 quote: provide sq_dequote_to_argv_array
9662 bisect: use argv_array API
9663 checkout: use argv_array API
9664 run_hook: use argv_array API
9665 pull,rebase: handle GIT_WORK_TREE better
9668 make the sample pre-commit hook script reject names with newlines, too
9670 Jonathan Nieder (2):
9671 http: remove extra newline in error message
9672 http: avoid empty error messages for some curl errors
9675 mergetool: Use args as pathspec to unmerged files
9678 refactor run_receive_hook()
9679 diff: teach --stat/--numstat to honor -U$num
9680 mergetool: no longer need to save standard input
9681 attr: read core.attributesfile from git_default_core_config
9684 Martin von Zweigbergk (4):
9685 remote: write correct fetch spec when renaming remote 'remote'
9686 remote: "rename o foo" should not rename ref "origin/bar"
9687 remote rename: warn when refspec was not updated
9688 remote: only update remote-tracking branch if updating refspec
9691 send-email: Honour SMTP domain when using TLS
9693 Michael Haggerty (1):
9694 notes_merge_commit(): do not pass temporary buffer to other function
9696 Michael J Gruber (3):
9697 unpack-trees: print "Aborting" to stderr
9698 git-read-tree.txt: language and typography fixes
9699 git-read-tree.txt: correct sparse-checkout and skip-worktree description
9701 Nguyễn Thái Ngọc Duy (2):
9702 git-read-tree.txt: update sparse checkout examples
9703 Reindent closing bracket using tab instead of spaces
9706 t7511: avoid use of reserved filename on Windows.
9709 gitweb: Fix links to lines in blobs when javascript-actions are enabled
9711 Ramsay Allan Jones (1):
9712 t9159-*.sh: skip for mergeinfo test for svn <= 1.4
9715 read-cache.c: fix index memory allocation
9717 Richard Hartmann (1):
9718 clone: Quote user supplied path in a single quote pair
9720 Shawn O. Pearce (1):
9721 remote-curl: Fix warning after HTTP failure
9724 Documentation/git-update-index: refer to 'ls-files'
9727 Documentation: basic configuration of notes.rewriteRef
9730 Version v1.7.7.1; changes since v1.7.7:
9731 ---------------------------------------
9734 rev-list: Demonstrate breakage with --ancestry-path --all
9737 strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()
9739 Ilari Liusvaara (1):
9740 Support ERR in remote archive like in fetch/push
9743 merge-one-file: fix "expr: non-numeric argument"
9746 fetch: avoid quadratic loop checking for updated submodules
9747 filter-branch: use require_clean_work_tree
9750 fix "git apply --index ..." not to deref NULL
9752 Jonathan Nieder (2):
9753 Makefile: do not set setgid bit on directories on GNU/kFreeBSD
9754 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
9756 Junio C Hamano (14):
9757 revision: keep track of the end-user input from the command line
9758 revision: do not include sibling history in --ancestry-path output
9759 rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
9760 traverse_trees(): allow pruning with pathspec
9761 unpack-trees: allow pruning with pathspec
9762 diff-index: pass pathspec down to unpack-trees machinery
9763 fsck: do not abort upon finding an empty blob
9764 Teach progress eye-candy to fetch_refs_from_bundle()
9765 apply --whitespace=error: correctly report new blank lines at end
9766 checkout $tree $path: do not clobber local changes in $path not in $tree
9767 diff: resurrect XDF_NEED_MINIMAL with --minimal
9769 Almost ready for 1.7.7.1
9773 rebase -i: clean error message for --continue after failed exec
9774 config: display key_delim for config --bool --get-regexp
9776 Michael Schubert (1):
9777 patch-id.c: use strbuf instead of a fixed buffer
9779 Nguyễn Thái Ngọc Duy (4):
9780 merge: keep stash[] a local variable
9781 merge: use return value of resolve_ref() to determine if HEAD is invalid
9782 merge: remove global variable head[]
9783 Accept tags in HEAD or MERGE_HEAD
9785 Nicolas Morey-Chaisemartin (1):
9786 grep: Fix race condition in delta_base_cache
9789 Revert removal of multi-match discard heuristic in 27af01
9790 t1304: fall back to $USER if $LOGNAME is not defined
9793 Symlink mergetools scriptlets into valgrind wrappers
9794 t6019: avoid refname collision on case-insensitive systems
9797 Version v1.7.7; changes since v1.7.7-rc3:
9798 -----------------------------------------
9801 contrib/hooks: adapt comment about Debian install location for contrib hooks
9802 templates/hooks--*: remove sample hooks without any functionality
9805 Documentation/gitnamespaces.txt: cater to older asciidoc
9809 Version v1.7.7-rc3; changes since v1.7.7-rc2:
9810 ---------------------------------------------
9813 describe: Refresh the index when run with --dirty
9816 git-mergetool: check return value from read
9819 t4014: clean up format.thread config after each test
9823 merge-recursive: Do not look at working tree during a virtual ancestor merge
9827 Version v1.7.7-rc2; changes since v1.7.7-rc1:
9828 ---------------------------------------------
9831 git-svn: teach git-svn to populate svn:mergeinfo
9833 Frédéric Heitzmann (1):
9834 Disambiguate duplicate t9160* tests
9837 branch --set-upstream: regression fix
9841 format-patch: ignore ui.color
9844 Version v1.7.7-rc1; changes since v1.7.7-rc0:
9845 ---------------------------------------------
9848 Documentation: Grammar correction, wording fixes and cleanup
9849 Mark http-fetch without -a as deprecated
9852 t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
9854 Brian Gernhardt (1):
9855 t5540-http-test: shorten grep pattern
9858 git-svn: Teach dcommit --mergeinfo to handle multiple lines
9861 Prevent force-updating of the current branch
9862 Show interpreted branch name in error messages
9864 Dmitry Ivankov (11):
9865 fast-import: add input format tests
9866 fast-import: don't fail on omitted committer name
9867 fast-import: check committer name more strictly
9868 fsck: add a few committer name tests
9869 fsck: improve committer/author check
9870 fast-import: add a test for tree delta base corruption
9871 fast-import: prevent producing bad delta
9872 fast-import: count and report # of calls to diff_delta in stats
9873 fast-import: treat cat-blob as a delta base hint for next blob
9874 fast-import: add tests for tagging blobs
9875 fast-import: allow to tag newly created objects
9878 t6042: Add a testcase where git deletes an untracked file
9879 t6042: Add failing testcase for rename/modify/add-source conflict
9880 t6042: Add a pair of cases where undetected renames cause issues
9881 t6042: Add a testcase where undetected rename causes silent file deletion
9882 t6042: Add tests for content issues with modify/rename/directory conflicts
9883 t6042: Ensure rename/rename conflicts leave index and workdir in sane state
9884 t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
9885 t6036: Add differently resolved modify/delete conflict in criss-cross test
9886 t6036: criss-cross with weird content can fool git into clean merge
9887 t6036: tests for criss-cross merges with various directory/file conflicts
9888 t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
9889 t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
9890 t6022: Remove unnecessary untracked files to make test cleaner
9891 t6022: New tests checking for unnecessary updates of files
9892 t6022: Add testcase for merging a renamed file with a simple change
9893 merge-recursive: Make BUG message more legible by adding a newline
9894 merge-recursive: Correct a comment
9895 merge-recursive: Mark some diff_filespec struct arguments const
9896 merge-recursive: Consolidate different update_stages functions
9897 merge-recursive: Remember to free generated unique path names
9898 merge-recursive: Avoid working directory changes during recursive case
9899 merge-recursive: Fix recursive case with D/F conflict via add/add conflict
9900 merge-recursive: Fix sorting order and directory change assumptions
9901 merge-recursive: Fix code checking for D/F conflicts still being present
9902 merge-recursive: Save D/F conflict filenames instead of unlinking them
9903 merge-recursive: Split was_tracked() out of would_lose_untracked()
9904 merge-recursive: Allow make_room_for_path() to remove D/F entries
9905 merge-recursive: Split update_stages_and_entry; only update stages at end
9906 merge-recursive: Fix deletion of untracked file in rename/delete conflicts
9907 merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
9908 merge-recursive: Add comments about handling rename/add-source cases
9909 merge-recursive: Improve handling of rename target vs. directory addition
9910 merge-recursive: Consolidate process_entry() and process_df_entry()
9911 merge-recursive: Cleanup and consolidation of rename_conflict_info
9912 merge-recursive: Provide more info in conflict markers with file renames
9913 merge-recursive: When we detect we can skip an update, actually skip it
9914 merge-recursive: Fix modify/delete resolution in the recursive case
9915 merge-recursive: Introduce a merge_file convenience function
9916 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
9917 merge-recursive: Small cleanups for conflict_rename_rename_1to2
9918 merge-recursive: Defer rename/rename(2to1) handling until process_entry
9919 merge-recursive: Record more data needed for merging with dual renames
9920 merge-recursive: Create function for merging with branchname:file markers
9921 merge-recursive: Consider modifications in rename/rename(2to1) conflicts
9922 merge-recursive: Make modify/delete handling code reusable
9923 merge-recursive: Have conflict_rename_delete reuse modify/delete code
9924 merge-recursive: add handling for rename/rename/add-dest/add-dest
9925 merge-recursive: Fix working copy handling for rename/rename/add/add
9926 t6022: Add testcase for spurious "refusing to lose untracked" messages
9927 merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
9928 t6022: Additional tests checking for unnecessary updates of files
9929 merge-recursive: Avoid unnecessary file rewrites
9930 t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
9931 merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
9932 merge-recursive: Don't re-sort a list whose order we depend upon
9935 git-svn: fix fetch with moved path when using rewriteRoot
9937 Fredrik Gustafsson (1):
9938 push: Don't push a repository with unpushed submodules
9940 Fredrik Kuivinen (6):
9941 Add obstack.[ch] from EGLIBC 2.10
9942 Add string search routines from GNU grep
9943 Adapt the kwset code to Git
9944 Use kwset in pickaxe
9946 obstack: Fix portability issues
9948 Giuseppe Bilotta (2):
9949 am: format is in $patch_format, not parse_patch
9950 am: fix stgit patch mangling
9953 t3030: fix accidental success in symlink rename
9954 t7006: modernize calls to unset
9955 test-lib: add helper functions for config
9956 t7006: use test_config helpers
9957 setup_pager: set GIT_PAGER_IN_USE
9958 diff: refactor COLOR_DIFF from a flag into an int
9959 git_config_colorbool: refactor stdout_is_tty handling
9960 color: delay auto-color decision until point of use
9961 config: refactor get_colorbool function
9962 diff: don't load color config in plumbing
9963 want_color: automatically fallback to color.ui
9964 support pager.* for external commands
9967 fetch: skip on-demand checking when no submodules are configured
9970 string-list: Add API to remove an item from an unsorted list
9971 t3005: do not assume a particular order of stdout and stderr of git-ls-files
9974 bisect: take advantage of gettextln, eval_gettextln.
9976 Jonathan Nieder (1):
9977 Documentation/remote-helpers: explain capabilities first
9979 Junio C Hamano (14):
9980 combine-diff: support format_callback
9981 read_gitfile_gently(): rename misnamed function to read_gitfile()
9982 clone: allow more than one --reference
9983 clone: clone from a repository with relative alternates
9984 Update draft release notes to 1.7.7
9985 Documentation: clarify "git clean -e <pattern>"
9986 Update draft release notes to 1.7.7
9987 Revert "Merge branch 'cb/maint-quiet-push' into maint"
9989 Update draft release notes to 1.7.7
9990 Minor update to how-to maintain git
9991 Prepare for 1.7.6.3 maintenance release
9996 Documentation/git-remote-helpers: explain how import works with multiple refs
9997 (short) documentation for the testgit remote helper
9999 Michael Haggerty (9):
10001 Document struct match_attr
10002 Increment num_attr in parse_attr_line(), not parse_attr()
10003 Change parse_attr() to take a pointer to struct attr_state
10004 Determine the start of the states outside of the pass loop
10005 Change while loop into for loop
10006 Unroll the loop over passes
10007 check-ref-format --print: Normalize refnames that start with slashes
10008 Forbid DEL characters in reference names
10010 Michael J Gruber (3):
10011 git-notes.txt: clarify -C vs. copy and -F
10012 log: Do not decorate replacements with --no-replace-objects
10013 RelNotes/1.7.7: minor fixes
10015 Michael Stapelberg (1):
10016 git-daemon.txt: specify --timeout in seconds
10019 branch -v: honor core.abbrev
10021 Nguyễn Thái Ngọc Duy (6):
10022 decoration: do not mis-decorate refs with same prefix
10023 Add for_each_commit_graft() to iterate all grafts
10024 Move write_shallow_commits to fetch-pack.c
10025 log: decorate grafted commits with "grafted"
10026 log: decorate "replaced" on to replaced commits
10027 clone: allow to clone from .git file
10030 git-p4: simple branch tests edits
10033 git-svn: New flag to emulate empty directories
10035 Sverre Rabbelier (1):
10036 SubmittingPathces: remove Cogito reference
10039 xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
10040 xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
10043 Use memmove in ident_to_git
10044 t4014: check for empty files from git format-patch --stdout
10045 t4014: invoke format-patch with --stdout where intended
10046 t4014: "no-add-headers" is actually called "no-add-header"
10047 Document negated forms of format-patch --to --cc --add-headers
10048 strbuf_grow(): maintain nul-termination even for new buffer
10049 Documentation: clarify effects of -- <path> arguments
10050 t3903: fix misquoted rev-parse invocation
10053 git-p4: Allow setting rename/copy detection threshold
10054 git-p4: Add description of rename/copy detection options
10055 git-p4: Add test case for rename detection
10056 git-p4: Add test case for copy detection
10057 git-p4: Process detectCopiesHarder with --bool
10058 git-p4: Correct branch base depot path detection
10059 git-p4: Allow filtering Perforce branches by user
10060 git-p4: Allow branch definition with git config
10061 git-p4: Add simple test case for branch import
10064 Version v1.7.7-rc0; changes since v1.7.6.6:
10065 -------------------------------------------
10068 describe: Refresh the index when run with --dirty
10071 Add profile feedback build to git
10072 Add explanation of the profile feedback build to the README
10074 Clemens Buchacher (1):
10075 commit: allow partial commits with relative paths
10078 setup: Provide GIT_PREFIX to built-ins
10079 git: Remove handling for GIT_PREFIX
10080 git-mergetool--lib: Make vimdiff retain the current directory
10081 t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
10082 difftool--helper: Make style consistent with git
10083 mergetool--lib: Make style consistent with git
10084 mergetool--lib: Refactor tools into separate files
10085 mergetools/meld: Use '--output' when available
10088 am: ignore leading whitespace before patch
10090 David Caldwell (1):
10091 stash: Add --include-untracked option to stash and remove all untracked files
10093 Dmitry Ivankov (4):
10094 remote-helpers: export GIT_DIR variable to helpers
10095 parse-options: export opterr, optbug
10096 Reduce parse-options.o dependencies
10097 doc/fast-import: document feature import-marks-if-exists
10100 http: pass http.cookiefile using CURLOPT_COOKIEFILE
10102 Erik Faye-Lund (2):
10103 verify_path: consider dos drive prefix
10104 connect: only log if all attempts failed (ipv4)
10106 Fredrik Gustafsson (2):
10107 git-sh-setup: add die_with_status
10108 submodule update: continue when a checkout fails
10110 Jakub Narębski (14):
10111 gitweb.js: No need for inProgress in blame_incremental.js
10112 gitweb.js: No need for loop in blame_incremental's handleResponse()
10113 gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
10114 gitweb: Check permissions first in git_search
10115 gitweb: Split body of git_search into subroutines
10116 gitweb: Clean up code in git_search_* subroutines
10117 gitweb: Make git_search_* subroutines render whole pages
10118 gitweb: Refactor git_header_html
10119 git-instaweb: Extract configuring web server into configure_httpd
10120 git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
10121 git-instaweb: Move all actions at the end of script
10122 git-instaweb: Check that correct config file exists for (re)start
10123 gitweb: Introduce common system-wide settings for convenience
10124 gitweb: Git config keys are case insensitive, make config search too
10127 t: add tests for cloning remotes with detached HEAD
10128 consider only branches in guess_remote_head
10129 make copy_ref globally available
10130 clone: always fetch remote HEAD
10131 limit "contains" traversals based on commit timestamp
10132 default core.clockskew variable to one day
10133 archive: reorder option parsing and config reading
10134 archive-tar: don't reload default config options
10135 archive: refactor list of archive formats
10136 archive: pass archiver struct to write_archive callback
10137 archive: move file extension format-guessing lower
10138 archive: refactor file extension format-guessing
10139 archive: implement configurable tar filters
10140 archive: provide builtin .tar.gz filter
10141 upload-archive: allow user to turn off filters
10142 parse-options: add OPT_STRING_LIST helper
10143 remote: use new OPT_STRING_LIST
10144 config: make git_config_parse_parameter a public function
10145 clone: accept config options on the command line
10146 git skew: a tool to find how big a clock skew exists in the history
10147 transport-helper: fix minor leak in push_refs_with_export
10148 t5800: factor out some ref tests
10149 t5800: document some non-functional parts of remote helpers
10150 git-remote-testgit: import non-HEAD refs
10151 transport-helper: don't feed bogus refs to export push
10152 git_remote_helpers: push all refs during a non-local export
10153 streaming: free git_istream upon closing
10154 docs: put listed example commands in backticks
10157 Documentation/submodule: add command references and update options
10160 sha1_file: use the correct type (ssize_t, not size_t) for read-style function
10163 sh-i18n--envsubst: do not crash when no arguments are given
10164 mingw.c: move definition of mingw_getenv down
10165 Windows: teach getenv to do a case-sensitive search
10166 rebase: do not print lots of usage hints after an obvious error message
10167 Make test number unique
10168 Skip archive --remote tests on Windows
10169 t3900: do not reference numbered arguments from the test script
10172 Add option hooks.diffopts to customize change summary in post-receive-email
10175 bisect: move argument parsing before state modification.
10176 bisect: use && to connect statements that are deferred with eval.
10177 bisect: add tests to document expected behaviour in presence of broken trees.
10178 bisect: introduce support for --no-checkout option.
10179 bisect: introduce --no-checkout support into porcelain.
10180 bisect: add tests for the --no-checkout option.
10181 bisect: add documentation for --no-checkout option.
10182 bisect: cleanup whitespace errors in git-bisect.sh.
10183 bisect: replace "; then" with "\n<tab>*then"
10184 misc-sh: fix up whitespace in some other .sh files.
10185 gettext: add gettextln, eval_gettextln to encode common idiom
10186 git-am: take advantage of gettextln and eval_gettextln.
10187 pull: take advantage of eval_gettextln
10188 stash: take advantage of eval_gettextln
10189 submodule: take advantage of gettextln and eval_gettextln.
10190 bisect: add support for bisecting bare repositories
10192 Jonathan Nieder (4):
10193 test: simplify return value of test_run_
10194 test: cope better with use of return for errors
10195 revert: plug memory leak in "cherry-pick root commit" codepath
10196 merge-recursive: take advantage of hardcoded empty tree
10199 Fix prefix handling in ref iteration functions
10200 ref namespaces: infrastructure
10201 ref namespaces: Support remote repositories via upload-pack and receive-pack
10202 ref namespaces: documentation
10203 ref namespaces: tests
10205 Junio C Hamano (52):
10206 index-pack: group the delta-base array entries also by type
10207 write_idx_file: introduce a struct to hold idx customization options
10208 index-pack: --verify
10209 write_idx_file: need_large_offset() helper function
10210 index-pack --verify: read anomalous offsets from v2 idx file
10211 packed_object_info_detail(): do not return a string
10212 sha1_object_info_extended(): expose a bit more info
10213 sha1_object_info_extended(): hint about objects in delta-base cache
10214 unpack_object_header(): make it public
10215 write_entry(): separate two helper functions out
10216 streaming: a new API to read from the object store
10217 streaming_write_entry(): use streaming API in write_entry()
10218 convert: CRLF_INPUT is a no-op in the output codepath
10219 streaming_write_entry(): support files with holes
10220 streaming: read non-delta incrementally from a pack
10221 sha1_file.c: expose helpers to read loose objects
10222 streaming: read loose objects incrementally
10223 checkout: make advice when reattaching the HEAD less loud
10224 merge: reword the final message
10225 convert.h: move declarations for conversion from cache.h
10226 Add streaming filter API
10227 stream filter: add "no more input" to the filters
10228 Add LF-to-CRLF streaming conversion
10229 streaming filter: ident filter
10230 streaming: filter cascading
10231 t0021: test application of both crlf and ident
10232 diff --stat-count: finishing touches
10233 index-pack: a miniscule refactor
10234 index-pack: start learning to emulate "verify-pack -v"
10235 index-pack: show histogram when emulating "verify-pack -v"
10236 verify-pack: use index-pack --verify
10237 verify_path(): simplify check at the directory boundary
10238 git-submodule.sh: clarify the "should we die now" logic
10239 Add option to disable NORETURN
10241 core: log offset pack data accesses happened
10242 pack-objects: optimize "recency order"
10243 diff-lib: simplify do_diff_cache()
10244 diff-lib: refactor run_diff_index() and do_diff_cache()
10245 Revert clock-skew based attempt to optimize tag --contains traversal
10246 Update draft release notes to 1.7.7
10247 Update draft release notes to 1.7.7
10248 bisect: further style nitpicks
10249 filter-branch.sh: de-dent usage string
10250 Update draft release notes to 1.7.7
10251 test: consolidate definition of $LF
10253 Update draft release notes to 1.7.7
10254 Update draft release notes to 1.7.7
10255 commit: reduce use of redundant global variables
10256 Update draft release notes to 1.7.7
10260 gitweb: allow space as delimiter in mime.types
10263 Update the Interix default build configuration.
10265 Michael Haggerty (29):
10266 doc: Add a link from gitattributes(5) to git-check-attr(1)
10267 doc: Correct git_attr() calls in example code
10268 Remove anachronism from comment
10269 Disallow the empty string as an attribute name
10270 git-check-attr: Add missing "&&"
10271 git-check-attr: Add tests of command-line parsing
10272 Provide access to the name attribute of git_attr
10273 git-check-attr: Use git_attr_name()
10274 Teach prepare_attr_stack() to figure out dirlen itself
10275 Extract a function collect_all_attrs()
10276 Remove redundant call to bootstrap_attr_stack()
10277 Remove redundant check
10278 Allow querying all attributes on a file
10279 git-check-attr: Extract a function output_attr()
10280 git-check-attr: Introduce a new variable
10281 git-check-attr: Extract a function error_with_usage()
10282 git-check-attr: Handle each error separately
10283 git-check-attr: Process command-line args more systematically
10284 git-check-attr: Error out if no pathnames are specified
10285 git-check-attr: Add an --all option to show all attributes
10286 git-check-attr: Drive two tests using the same raw data
10287 git-check-attr: Fix command-line handling to match docs
10288 Rename git_checkattr() to git_check_attr()
10289 git-check-attr: test that no output is written to stderr
10290 git-check-attr: Demonstrate problems with unnormalized paths
10291 git-check-attr: Demonstrate problems with relative paths
10292 git-check-attr: Normalize paths
10293 test-path-utils: Add subcommand "absolute_path"
10294 test-path-utils: Add subcommand "prefix_path"
10296 Michael J Gruber (3):
10297 diff.c: omit hidden entries from namelen calculation with --stat
10298 diff: introduce --stat-lines to limit the stat lines
10299 diff-options.txt: describe --stat-{width,name-width,count}
10302 git-p4: use test_when_finished in tests
10303 git-p4: add missing && in test
10304 git-p4: one test missing config git-p4.skipSubmitEditCheck
10305 git-p4: commit time should be most recent p4 change time
10307 Ramsay Allan Jones (3):
10308 help.c: Fix detection of custom merge strategy on cygwin
10309 t1301-*.sh: Fix the 'forced modes' test on cygwin
10310 config.c: Make git_config() work correctly when called recursively
10313 t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
10314 grep: fix coloring of hunk marks between files
10316 grep: add --heading
10317 grep: add option to show whole function as context
10318 grep: long context options
10321 Tolerate zlib deflation with window size < 32Kb
10323 Sverre Rabbelier (14):
10324 t5800: use skip_all instead of prereq
10325 remote-curl: accept empty line as terminator
10326 git-remote-testgit: only push for non-local repositories
10327 git-remote-testgit: fix error handling
10328 fast-import: introduce 'done' command
10329 fast-export: support done feature
10330 transport-helper: factor out push_update_refs_status
10331 transport-helper: check status code of finish_command
10332 transport-helper: use the new done feature where possible
10333 transport-helper: update ref status after push with export
10334 transport-helper: change import semantics
10335 transport-helper: Use capname for refspec capability too
10336 transport-helper: implement marks location as capability
10337 transport-helper: die early on encountering deleted refs
10339 Tay Ray Chuan (13):
10340 xdiff/xprepare: use memset()
10341 xdiff/xprepare: refactor abort cleanups
10342 xdiff/xpatience: factor out fall-back-diff function
10343 t4033-diff-patience: factor out tests
10344 teach --histogram to diff
10345 xdiff/xprepare: skip classification
10346 xdiff/xprepare: use a smaller sample size for histogram diff
10347 xdiff: do away with xdl_mmfile_next()
10348 http.c: fix an invalid free()
10349 Makefile: some changes for http-related flag documentation
10350 xdiff/xhistogram: rework handling of recursed results
10351 xdiff/xhistogram: rely on xdl_trim_ends()
10352 xdiff/xhistogram: drop need for additional variable
10355 A Windows path starting with a backslash is absolute
10356 real_path: do not assume '/' is the path seperator
10357 verify_dotfile(): do not assume '/' is the path seperator
10360 Makefile: add Minix configuration options.
10362 maximilian attems (2):
10363 am: pass exclude down to apply
10364 am: Document new --exclude=<path> option
10366 Ævar Arnfjörð Bjarmason (48):
10367 i18n: git-am add git-sh-i18n
10368 i18n: git-am one-line gettext $msg; echo
10369 i18n: git-am multi-line getttext $msg; echo
10370 i18n: git-am eval_gettext messages
10371 i18n: git-am gettext + gettext to stderr message
10372 i18n: git-am die messages
10373 i18n: git-am cannot_fallback messages
10374 i18n: git-am clean_abort messages
10375 i18n: git-am "Apply?" message
10376 i18n: git-am "Falling back" say message
10377 i18n: git-am core say messages
10378 i18n: git-am printf(1) message to eval_gettext
10379 i18n: git-pull add git-sh-i18n
10380 i18n: git-pull die messages
10381 i18n: git-pull eval_gettext + die message
10382 i18n: git-pull eval_gettext + warning message
10383 i18n: git-submodule add git-sh-i18n
10384 i18n: git-submodule echo + eval_gettext messages
10385 i18n: git-submodule say + eval_gettext messages
10386 i18n: git-submodule die + eval_gettext messages
10387 i18n: git-submodule $update_module say + die messages
10388 i18n: git-submodule "cached cannot be used" message
10389 i18n: git-submodule "Submodule change[...]" messages
10390 i18n: git-submodule $errmsg messages
10391 i18n: git-submodule "Entering [...]" message
10392 i18n: git-submodule "[...] path is ignored" message
10393 i18n: git-submodule "path not initialized" message
10394 i18n: git-submodule "blob" and "submodule" messages
10395 i18n: git-stash add git-sh-i18n
10396 i18n: git-stash echo + gettext message
10397 i18n: git-stash say + gettext messages
10398 i18n: git-stash die + gettext messages
10399 i18n: git-stash die + eval_gettext messages
10400 i18n: git-stash die + eval_gettext $* messages
10401 i18n: git-stash die + eval_gettext $1 messages
10402 i18n: git-stash "unknown option" message
10403 i18n: git-stash drop_stash say/die messages
10404 i18n: git-bisect add git-sh-i18n
10405 i18n: git-bisect gettext + echo message
10406 i18n: git-bisect echo + gettext messages
10407 i18n: git-bisect echo + eval_gettext message
10408 i18n: git-bisect die + gettext messages
10409 i18n: git-bisect die + eval_gettext messages
10410 i18n: git-bisect bisect_run + $@ messages
10411 i18n: git-bisect bisect_reset + $1 messages
10412 i18n: git-bisect bisect_replay + $1 messages
10413 i18n: git-bisect [Y/n] messages
10414 i18n: git-bisect bisect_next_check "You need to" message
10417 gitweb: pass string after encoding in utf-8 to syntax highlighter
10420 Version v1.7.6.6; changes since v1.7.6.5:
10421 -----------------------------------------
10423 Clemens Buchacher (1):
10424 Documentation: read-tree --prefix works with existing subtrees
10427 Add MYMETA.json to perl/.gitignore
10430 attr: don't confuse prefixes with leading directories
10431 attr: drop misguided defensive coding
10432 attr: fix leak in free_attr_elem
10433 thin-pack: try harder to use preferred base objects as base
10434 imap-send: remove dead code
10436 Junio C Hamano (6):
10437 attr.c: make bootstrap_attr_stack() leave early
10438 attr.c: clarify the logic to pop attr_stack
10439 Documentation: rerere's rr-cache auto-creation and rerere.enabled
10440 Prepare for 1.7.6.6
10441 Update draft release notes to 1.7.6.6
10444 Nguyễn Thái Ngọc Duy (1):
10445 t2203: fix wrong commit command
10448 Documentation: rerere.enabled is the primary way to configure rerere
10451 Version v1.7.6.5; changes since v1.7.6.4:
10452 -----------------------------------------
10455 date.c: Support iso8601 timezone formats
10458 stripspace: fix outdated comment
10459 fetch: create status table using strbuf
10460 blame: don't overflow time buffer
10463 make the sample pre-commit hook script reject names with newlines, too
10466 mergetool: Use args as pathspec to unmerged files
10468 Junio C Hamano (3):
10469 mergetool: no longer need to save standard input
10470 name-rev --all: do not even attempt to describe non-commit object
10473 Marc-André Lureau (1):
10474 mailmap: xcalloc mailmap_info
10476 Martin von Zweigbergk (4):
10477 remote: write correct fetch spec when renaming remote 'remote'
10478 remote: "rename o foo" should not rename ref "origin/bar"
10479 remote rename: warn when refspec was not updated
10480 remote: only update remote-tracking branch if updating refspec
10482 Michael Haggerty (1):
10483 notes_merge_commit(): do not pass temporary buffer to other function
10485 Michael J Gruber (3):
10486 unpack-trees: print "Aborting" to stderr
10487 git-read-tree.txt: language and typography fixes
10488 git-read-tree.txt: correct sparse-checkout and skip-worktree description
10490 Nguyễn Thái Ngọc Duy (2):
10491 git-read-tree.txt: update sparse checkout examples
10492 Reindent closing bracket using tab instead of spaces
10495 gitweb: Fix links to lines in blobs when javascript-actions are enabled
10497 Ramsay Allan Jones (1):
10498 t9159-*.sh: skip for mergeinfo test for svn <= 1.4
10500 Sebastian Morr (1):
10501 Add MYMETA.yml to perl/.gitignore
10504 Documentation/git-update-index: refer to 'ls-files'
10507 Documentation: basic configuration of notes.rewriteRef
10510 Version v1.7.6.4; changes since v1.7.6.3:
10511 -----------------------------------------
10514 describe: Refresh the index when run with --dirty
10516 Clemens Buchacher (1):
10517 ls-files: fix pathspec display on error
10519 Giuseppe Bilotta (1):
10520 am: format is in $patch_format, not parse_patch
10523 git-mergetool: check return value from read
10526 t3005: do not assume a particular order of stdout and stderr of git-ls-files
10528 Junio C Hamano (4):
10529 read_gitfile_gently(): rename misnamed function to read_gitfile()
10530 clone: allow more than one --reference
10531 clone: clone from a repository with relative alternates
10534 Michael Haggerty (2):
10535 check-ref-format --print: Normalize refnames that start with slashes
10536 Forbid DEL characters in reference names
10538 Michael J Gruber (1):
10539 branch.c: use the parsed branch name
10541 Nguyễn Thái Ngọc Duy (1):
10542 clone: allow to clone from .git file
10545 Version v1.7.6.3; changes since v1.7.6.2:
10546 -----------------------------------------
10549 Do not log unless all connect() attempts fail
10552 status: fix bug with missing --ignore files
10553 tag: speed up --contains calculation
10554 strbuf_split: add a max parameter
10555 fix "git -c" parsing of values with equals signs
10556 config: die on error in command-line config
10557 config: avoid segfault when parsing command-line config
10558 strbuf: allow strbuf_split to work on non-strbufs
10559 config: use strbuf_split_str instead of a temporary strbuf
10560 reset: give better reflog messages
10563 fetch: skip on-demand checking when no submodules are configured
10565 Jonathan Nieder (2):
10566 Documentation: quote double-dash for AsciiDoc
10567 Documentation/i18n: quote double-dash for AsciiDoc
10569 Junio C Hamano (4):
10570 git status --ignored: tests and docs
10571 mergetool: check return value from read
10572 Prepare for 1.7.6.3 maintenance release
10575 Michael Schubert (1):
10576 reflog: actually default to subcommand 'show'
10578 Sverre Rabbelier (1):
10579 SubmittingPathces: remove Cogito reference
10581 Vitaliy Ivanov (1):
10582 tests: cleanup binary test vector files
10585 Version v1.7.6.2; changes since v1.7.6.1:
10586 -----------------------------------------
10588 Junio C Hamano (3):
10589 whitespace: have SP on both sides of an assignment "="
10590 Revert "Merge branch 'cb/maint-quiet-push' into maint"
10594 update-ref: whitespace fix
10597 Documentation: clarify effects of -- <path> arguments
10600 Version v1.7.6.1; changes since v1.7.6:
10601 ---------------------------------------
10603 Alex Neronskiy (2):
10604 Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
10605 Document the underlying protocol used by shallow repositories and --depth commands.
10608 rebase -i -p: include non-first-parent commits in todo list
10611 Documentation: clearly specify what refs are honored by core.logAllRefUpdates
10614 t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
10615 git-submodule.sh: preserve stdin for the command spawned by foreach
10618 get_indexed_object can return NULL if nothing is in that slot; check for it
10620 Carlos Martín Nieto (1):
10621 Documentation: clarify the invalidated tree entry format
10623 Clemens Buchacher (3):
10624 error_routine: use parent's stderr if exec fails
10625 propagate --quiet to send-pack/receive-pack
10626 notice error exit from pager
10628 Dmitry Ivankov (1):
10629 doc/fast-import: clarify notemodify command
10631 Emilio G. Cota (2):
10632 Documentation: ignore *.pdf files
10633 Documentation/Makefile: add *.pdf to `clean' target
10635 Erik Faye-Lund (1):
10636 connect: correctly number ipv6 network adapter
10638 Fredrik Kuivinen (1):
10639 Makefile: Track changes to LDFLAGS and relink when necessary
10642 add gitignore entry to description about how to write a builtin
10643 add technical documentation about ref iteration
10646 Documentation: minor grammatical fix in rev-list-options.txt
10648 Jakub Narębski (2):
10649 gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
10650 gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
10653 combine-diff: split header printing into its own function
10654 combine-diff: calculate mode_differs earlier
10655 combine-diff: handle binary files as binary
10656 refactor get_textconv to not require diff_filespec
10657 combine-diff: respect textconv attributes
10658 tag: accept multiple patterns for --list
10659 docs: document --textconv diff option
10660 t7400: fix bogus test failure with symlinked trash
10661 fast-export: quote paths in output
10662 am: refresh the index at start and --resolved
10665 submodule add: test failure when url is not configured in superproject
10666 submodule add: allow relative repository path even when no url is set
10667 submodule add: clean up duplicated code
10668 fetch: Also fetch submodules in subdirectories in on-demand mode
10669 submodule add: always initialize .git/config entry
10670 tests: print failed test numbers at the end of the test run
10671 submodule: update and add must honor --quiet flag
10673 Johannes Schindelin (1):
10674 get_pwd_cwd(): Do not trust st_dev/st_ino blindly
10677 Add a test to check that git ls-tree sets non-zero exit code on error.
10678 Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
10680 Julian Phillips (1):
10681 remote-curl: Add a format check to parsing of info/refs
10683 Junio C Hamano (29):
10684 diff-index --quiet: learn the "stop feeding the backend early" logic
10685 checkout -b <name>: correctly detect existing branch
10686 sha1_file.c: "legacy" is really the current format
10687 zlib wrapper: refactor error message formatter
10688 zlib: wrap remaining calls to direct inflate/inflateEnd
10689 zlib: wrap inflateInit2 used to accept only for gzip format
10690 zlib: wrap deflate side of the API
10691 zlib: wrap deflateBound() too
10692 zlib: zlib can only process 4GB at a time
10693 zlib: allow feeding more than 4GB in one go
10694 t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
10695 cygwin: trust executable bit by default
10696 git-remote.txt: avoid sounding as if loose refs are the only ones in the world
10697 check-ref-format doc: de-emphasize the implementation detail of a ref
10698 git.txt: de-emphasize the implementation detail of a ref
10699 glossary: update description of "tag"
10700 glossary: update description of head and ref
10701 glossary: clarify description of HEAD
10702 submodule sync: do not auto-vivify uninteresting submodule
10703 "branch -d" can remove more than one branches
10704 test: skip clean-up when running under --immediate mode
10705 checkout: do not write bogus reflog entry out
10706 reset [<commit>] paths...: do not mishandle unmerged paths
10707 diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
10708 receive-pack: do not overstep command line argument array
10709 helping smart-http/stateless-rpc fetch race
10710 Prepare for 1.7.6.1
10711 Update draft release notes for 1.7.6.1
10714 Martin von Zweigbergk (2):
10715 Documentation: use [verse] for SYNOPSIS sections
10716 rebase: clarify "restore the original branch"
10718 Michael Haggerty (6):
10719 git-svn: Demonstrate a bug with root commits in mergeinfo ranges
10720 git-svn: Disambiguate rev-list arguments to improve error message
10721 git-svn: Correctly handle root commits in mergeinfo ranges
10722 gitattributes: Clarify discussion of attribute macros
10723 gitattributes: Reword "attribute macro" to "macro attribute"
10724 Do not use C++-style comments
10726 Michael Schubert (1):
10727 help_unknown_cmd: do not propose an "unknown" cmd
10729 Michael Witten (1):
10730 filter-branch: Export variable `workdir' for --commit-filter
10733 git-remote.txt: fix wrong remote refspec
10735 Nguyễn Thái Ngọc Duy (3):
10736 Break down no-lstat() condition checks in verify_uptodate()
10737 checkout-index: remove obsolete comment
10738 fetch-pack: check for valid commit from server
10741 pull: remove extra space from reflog message
10743 Pavan Kumar Sunkara (1):
10744 git-config: Remove extra whitespaces
10746 Peter Collingbourne (1):
10747 Documentation: git-filter-branch honors replacement refs
10750 Version v1.7.6; changes since v1.7.6-rc3:
10751 -----------------------------------------
10753 Junio C Hamano (1):
10757 completion: replace core.abbrevguard to core.abbrev
10760 Version v1.7.6-rc3; changes since v1.7.6-rc2:
10761 ---------------------------------------------
10763 Andreas Schwab (1):
10764 builtin/gc.c: add missing newline in message
10767 sh-i18n--envsubst.c: do not #include getopt.h
10769 Christof Krüger (1):
10770 Documentation: git diff --check respects core.whitespace
10772 Dmitry Ivankov (1):
10773 Fix typo: existant->existent
10775 Jakub Narębski (1):
10776 gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
10779 t/Makefile: pass test opts to valgrind target properly
10780 tests: link shell libraries into valgrind directory
10783 plug a few coverity-spotted leaks
10785 Junio C Hamano (2):
10786 t7810: avoid unportable use of "echo"
10790 Version v1.7.6-rc2; changes since v1.7.6-rc1:
10791 ---------------------------------------------
10793 Jonathan Nieder (1):
10794 gitweb: do not misparse nonnumeric content tag files that contain a digit
10796 Junio C Hamano (1):
10800 Version v1.7.6-rc1; changes since v1.7.6-rc0:
10801 ---------------------------------------------
10804 t3703: skip more tests using colons in file names on Windows
10807 t7508: demonstrate status's failure to use --porcelain format with -z
10808 builtin/commit.c: set status_format _after_ option parsing
10810 Jakub Narębski (4):
10811 gitweb: Move information about installation from README to INSTALL
10812 gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
10813 gitweb: Move "Requirements" up in gitweb/INSTALL
10814 gitweb: Fix usability of $prevent_xss
10817 diff_tree: disable QUICK optimization with diff filter
10820 fetch: do not leak a refspec
10822 Junio C Hamano (2):
10823 diff: futureproof "stop feeding the backend early" logic
10827 Version v1.7.6-rc0; changes since v1.7.5.4:
10828 -------------------------------------------
10831 Do not strip empty lines / trailing spaces from a commit message template
10833 Carlos Martín Nieto (1):
10834 log: convert to parse-options
10837 Use a temporary index for git commit --interactive
10838 Allow git commit --interactive with paths
10839 Add support for -p/--patch to git-commit
10840 Add commit to list of config.singlekey commands
10841 Test atomic git-commit --interactive
10844 rebase: create HEAD reflog entry when aborting
10847 Share color list between graph and show-branch
10848 http: make curl callbacks match contracts from curl header
10849 http-push: use const for strings in signatures
10850 http-push: refactor curl_easy_setup madness
10853 t6022: New test checking for unnecessary updates of renamed+modified files
10854 t6022: New test checking for unnecessary updates of files in D/F conflicts
10855 merge-recursive: When we detect we can skip an update, actually skip it
10857 Erik Faye-Lund (2):
10858 strbuf: make sure buffer is zero-terminated
10859 config: support values longer than 1023 bytes
10862 test that git status works with merge conflict in, .gitmodules
10865 hashcmp(): inline memcmp() by hand to optimize
10867 Jakub Narębski (13):
10868 gitweb: Restructure projects list generation
10869 gitweb: Change the way "content tags" ('ctags') are handled
10870 gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
10871 gitweb: Split JavaScript for maintability, combining on build
10872 gitweb.js: Update and improve comments in JavaScript files
10873 gitweb.js: Provide default values for padding in padLeftStr and padLeft
10874 gitweb.js: Extract and improve datetime handling
10875 gitweb.js: Introduce code to handle cookies from JavaScript
10876 gitweb.js: Provide getElementsByClassName method (if it not exists)
10877 gitweb: Refactor generating of long dates into format_timestamp_html
10878 gitweb: Unify the way long timestamp is displayed
10879 gitweb: Make JavaScript ability to adjust timezones configurable
10880 gitweb: Refactor reading and parsing config file into read_config_file
10883 "git log -h": typofix misspelled 'suppress'
10884 Add log.abbrevCommit config variable
10887 notes: make expand_notes_ref globally accessible
10888 revision.c: refactor notes ref expansion
10889 notes: refactor display notes extra refs field
10890 notes: refactor display notes default handling
10891 revision.c: support --notes command-line option
10892 revision.c: make --no-notes reset --notes list
10893 format-patch: wrap email addresses after long names
10894 add tests for various blame formats
10895 blame: refactor porcelain output
10896 blame: add --line-porcelain output format
10897 t7501.8: feed a meaningful command
10898 fetch: avoid repeated commits in mark_complete
10899 Makefile: sort TEST_PROGRAMS list
10900 refactor refs_from_alternate_cb to allow passing extra data
10901 bisect: refactor sha1_array into a generic sha1 list
10902 receive-pack: eliminate duplicate .have refs
10903 doc: discuss textconv versus external diff drivers
10904 remote: allow "-t" with fetch mirrors
10905 read_in_full: always report errors
10906 t: test subject handling in format-patch / am pipeline
10907 mailinfo: always clean up rfc822 header folding
10908 pretty: add pp_commit_easy function for simple callers
10909 clean up calling conventions for pretty.c functions
10910 format-patch: preserve subject newlines with -k
10911 rebase: write a reflog entry when finishing
10912 format-patch: make zero-length subject prefixes prettier
10915 Submodules: Don't parse .gitmodules when it contains, merge conflicts
10916 unpack-trees: add the dry_run flag to unpack_trees_options
10917 Teach read-tree the -n|--dry-run option
10920 diffcore-rename.c: avoid set-but-not-used warning
10921 plug a DIR buffer leak in rerere.c
10923 Johan Herland (10):
10924 log/pretty-options: Document --[no-]notes and deprecate old notes options
10925 Make "git notes add" more user-friendly when there are existing notes
10926 Add several testcases for --dirstat and friends
10927 Make --dirstat=0 output directories that contribute < 0.1% of changes
10928 Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
10929 Add config variable for specifying default --dirstat behavior
10930 Allow specifying --dirstat cut-off percentage as a floating point number
10931 New --dirstat=lines mode, doing dirstat analysis based on diffstat
10932 Improve error handling when parsing dirstat parameters
10933 Mark dirstat error messages for translation
10936 t3703: Skip tests using directory name ":" on Windows
10937 Tweak t3102-ls-tree-wildcards to run on Windows
10938 Windows: add a wrapper for the shutdown() system call
10940 John 'Warthog9' Hawley (2):
10941 gitweb: JavaScript ability to adjust time based on timezone
10942 gitweb.js: Add UI for selecting common timezone to display dates
10945 git: add --info-path and --man-path options
10947 Jonathan Nieder (15):
10948 revisions: split out handle_revision_pseudo_opt function
10949 revisions: allow --glob and friends in parse_options-enabled commands
10950 Documentation: clarify meaning of --html-path, --man-path, and --info-path
10951 tests: eliminate unnecessary setup test assertions
10952 tests: teach verify_parents to check for extra parents
10953 tests: check git does not barf on merge.ff values for future versions of git
10954 completion: move private shopt shim for zsh to __git_ namespace
10955 t4018 (funcname patterns): make .gitattributes state easier to track
10956 t4018 (funcname patterns): make configuration easier to track
10957 t4018 (funcname patterns): minor cleanups
10958 userdiff/perl: anchor "sub" and "package" patterns on the left
10959 userdiff/perl: match full line of POD headers
10960 userdiff/perl: catch sub with brace on second line
10961 tests: make test_expect_code quieter on success
10962 userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
10964 Junio C Hamano (53):
10965 merge-recursive: tweak magic band-aid
10966 git diff -D: omit the preimage of deletes
10967 pathspec: rename per-item field has_wildcard to use_wildcard
10968 magic pathspec: add tentative ":/path/from/top/level" pathspec support
10969 merge: allow "-" as a short-hand for "previous branch"
10970 magic pathspec: futureproof shorthand form
10971 magic pathspec: add ":(icase)path" to match case insensitively
10973 Update draft release notes to 1.7.6
10974 Update draft release notes to 1.7.6
10975 Update draft release notes to 1.7.6
10976 Update draft release notes to 1.7.6
10977 merge: introduce merge.ff configuration variable
10978 rerere: libify rerere_clear() and rerere_gc()
10979 index_fd(): turn write_object and format_check arguments into one flag
10980 index_fd(): split into two helper functions
10981 convert: rename the "eol" global variable to "core_eol"
10982 convert: give saner names to crlf/eol variables, types and functions
10983 convert: make it safer to add conversion attributes
10984 convert: make it harder to screw up adding a conversion attribute
10985 git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
10986 Revert "magic pathspec: add ":(icase)path" to match case insensitively"
10987 pathspec: drop "lone : means no pathspec" from get_pathspec()
10988 grep: use get_pathspec() correctly
10989 fix overstrict :<path> diagnosis
10990 fix overslow :/no-such-string-ever-existed diagnostics
10991 rev/path disambiguation: further restrict "misspelled index entry" diag
10992 Revert "completion: don't declare 'local words' to make zsh happy"
10993 Update draft release notes to 1.7.6
10994 revision.c: leave a note for "a lone :" enhancement
10995 Update draft release notes to 1.7.6
10996 Bigfile: teach "git add" to send a large file straight to a pack
10997 Declare lookup_replace_object() in cache.h, not in commit.h
10998 t6050: make sure we test not just commit replacement
10999 read_sha1_file(): get rid of read_sha1_file_repl() madness
11000 inline lookup_replace_object() calls
11001 read_sha1_file(): allow selective bypassing of replacement mechanism
11002 Sync release notes for 1.7.6 to exclude what are in maintenance track
11003 git-grep: update tests now regexp type is "last one wins"
11004 Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
11005 Update release notes to 1.7.6
11006 notes remove: allow removing more than one
11007 notes remove: --ignore-missing
11008 notes remove: --stdin reads from the standard input
11009 show: --ignore-missing
11010 Revert "Merge branch 'en/merge-recursive'"
11011 Update draft release notes to 1.7.6
11012 Update 1.7.6 draft release notes
11013 require-work-tree wants more than what its name says
11014 compat/fnmatch/fnmatch.c: give a fall-back definition for NULL
11015 Update 1.7.6 draft release notes
11016 log: --quiet should serve as synonym to -s
11017 Update draft release notes to 1.7.6
11020 git-p4: add option to preserve user names
11021 git-p4: small improvements to user-preservation
11022 git-p4: warn if git authorship won't be retained
11024 Marius Storm-Olsen (1):
11025 Automatically autoload bashcompinit for ZSH, when needed
11027 Martin von Zweigbergk (34):
11028 rebase: clearer names for directory variables
11029 rebase: refactor reading of state
11030 rebase: read state outside loop
11031 rebase: remove unused rebase state 'prev_head'
11032 rebase: improve detection of rebase in progress
11033 rebase: act on command line outside parsing loop
11034 rebase: stricter check of standalone sub command
11035 rebase: align variable names
11036 rebase: align variable content
11037 rebase: factor out command line option processing
11038 rebase -i: remove now unnecessary directory checks
11039 rebase: reorder validation steps
11040 rebase: factor out reference parsing
11041 rebase: factor out clean work tree check
11042 rebase: factor out call to pre-rebase hook
11043 rebase -i: support --stat
11044 rebase: remove $branch as synonym for $orig_head
11045 rebase: extract merge code to new source file
11046 rebase: extract am code to new source file
11047 rebase: show consistent conflict resolution hint
11048 rebase -i: align variable names
11049 rebase: make -v a tiny bit more verbose
11050 rebase: factor out sub command handling
11051 rebase: extract code for writing basic state
11052 rebase: remember verbose option
11053 rebase: remember strategy and strategy options
11054 rebase -m: remember allow_rerere_autoupdate option
11055 rebase -m: don't print exit code 2 when merge fails
11056 git-rebase--am: remove unnecessary --3way option
11057 rebase -i: don't read unused variable preserve_merges
11058 rebase -i: remove unnecessary state rebase-root
11059 rebase: use @{upstream} if no upstream specified
11060 Makefile: do not install sourced rebase scripts
11061 rebase: define options in OPTIONS_SPEC
11063 Mathias Lafeldt (1):
11064 t/test-lib.sh: minor readability improvements
11066 Michael Haggerty (1):
11067 git-svn: add an option to skip the creation of empty directories
11069 Michael J Gruber (7):
11070 contrib/completion: --notes, --no-notes
11071 rev-list --count: separate count for --cherry-mark
11072 t1020: test !alias in subdirectory
11073 handle_alias: provide GIT_PREFIX to !alias
11074 config: define and document exit codes
11075 config: Give error message when not changing a multivar
11076 sh-18n: quell "unused variable" warning
11078 Michael Schubert (2):
11079 tag: disallow '-' as tag name
11080 ls-remote: the --exit-code option reports "no matching refs"
11082 Michał Kiedrowicz (11):
11083 Documentation: Add --line-number to git-grep synopsis
11084 contrib/completion: --line-number to git grep
11085 grep: Put calls to fixmatch() and regmatch() into patmatch()
11086 grep: Fix a typo in a comment
11087 grep: Extract compile_regexp_failed() from compile_regexp()
11088 git-grep: Learn PCRE
11089 configure: Check for libpcre
11090 grep: Add basic tests
11091 git-grep: Bail out when -P is used with -F or -E
11092 git-grep: Update tests (mainly for -P)
11093 git-grep: Fix problems with recently added tests
11096 blame: add --abbrev command line option and make it honor core.abbrev
11098 Nguyễn Thái Ngọc Duy (8):
11099 Reimplement read_tree_recursive() using tree_entry_interesting()
11100 Convert read_tree{,_recursive} to support struct pathspec
11101 Improve tree_entry_interesting() handling code
11102 setup: return correct prefix if worktree is '/'
11103 Kill off get_relative_cwd()
11104 t1011: fix sparse-checkout initialization and add new file
11105 sparse checkout: do not eagerly decide the fate for whole directory
11106 t3703, t4208: add test cases for magic pathspec
11108 Nicolas Morey-Chaisemartin (1):
11109 submodule: Add --force option for git submodule update
11111 Rafael Gieschke (1):
11112 ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd
11114 Ramsay Allan Jones (9):
11115 Makefile: Use cgcc rather than sparse in the check target
11116 sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
11117 sparse: Fix some "Using plain integer as NULL pointer" warnings
11118 sparse: Fix an "symbol 'format_subject' not declared" warning
11119 sparse: Fix an "symbol 'merge_file' not decared" warning
11120 sparse: Fix errors due to missing target-specific variables
11121 sparse: Fix some "symbol not declared" warnings
11122 setup.c: Fix some "symbol not declared" sparse warnings
11123 config.c: Remove unused git_config_global() function
11126 strbuf: clarify assertion in strbuf_setlen()
11129 completion: don't modify the $cur variable in completion functions
11130 completion: remove unnecessary _get_comp_words_by_ref() invocations
11131 completion: don't declare 'local words' to make zsh happy
11133 Sebastien Cevey (3):
11134 gitweb: Split git_project_list_body in two functions
11135 gitweb: Modularized git_get_project_description to be more generic
11136 gitweb: Optional grouping of projects by category
11139 t5541-http-push: add test for chunked
11141 Ævar Arnfjörð Bjarmason (5):
11142 git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
11143 git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
11144 git-sh-i18n.sh: add GIT_GETTEXT_POISON support
11145 Makefile: add xgettext target for *.sh files
11146 git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
11149 Version v1.7.5.4; changes since v1.7.5.3:
11150 -----------------------------------------
11153 Documentation/technical/api-diff.txt: correct name of diff_unmerge()
11154 git-submodule.sh: separate parens by a space to avoid confusing some shells
11157 config: make environment parsing routines static
11158 git_config: don't peek at global config_parameters
11159 config: always parse GIT_CONFIG_PARAMETERS during git_config
11160 read_gitfile_gently: use ssize_t to hold read result
11161 docs: minor grammar fixes to git-status
11162 docs: update status --porcelain format
11163 docs: make sure literal "->" isn't converted to arrow
11164 docs: fix some antique example output
11167 rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
11168 remove tests of always-false condition
11169 diffcore-rename.c: avoid set-but-not-used warning
11171 Jonathan Nieder (3):
11172 tests: check error message from run_command
11173 run-command: handle short writes and EINTR in die_child
11174 Documentation: do not misinterpret refspecs as bold text
11176 Junio C Hamano (26):
11177 builtin/diff.c: remove duplicated call to diff_result_code()
11178 diffcore-rename: refactor "too many candidates" logic
11179 diffcore-rename: record filepair for rename src
11180 diffcore-rename: fall back to -C when -C -C busts the rename limit
11181 i18n: do not overuse C_LOCALE_OUTPUT
11182 i18n: .git file is not a human readable message (t5601)
11183 i18n: use test_i18ncmp in t1200 and t2200
11184 i18n: do not overuse C_LOCALE_OUTPUT (grep)
11185 i18n: use test_i18ngrep in lib-httpd and t2019
11186 i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
11187 i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
11188 i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
11189 i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
11190 i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
11191 i18n: use test_i18ngrep in t7201
11192 i18n: use test_i18ncmp in t7500
11193 i18n: use test_i18ngrep in t7501
11194 i18n: use test_i18ngrep and test_i18ncmp in t7502
11195 i18n: use test_i18ngrep in t7506
11196 i18n: use test_i18n{grep,cmp} in t7508
11197 i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
11198 handle_options(): do not miscount how many arguments were used
11199 userformat_find_requirements(): find requirement for the correct format
11200 config.mak.in: allow "configure --sysconfdir=/else/where"
11201 Start 1.7.5.4 draft release notes
11204 Mathias Lafeldt (1):
11205 t/README: unify documentation of test function args
11207 Ramkumar Ramachandra (4):
11208 Documentation: Add filter.<driver>.* to config
11209 Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
11210 Documentation: Add diff.<driver>.* to config
11211 Documentation: Allow custom diff tools to be specified in 'diff.tool'
11214 add -i: ignore terminal escape sequences
11216 Valentin Haenel (5):
11217 config.txt: 'interactive.singlekey; is used by...
11218 git-add.txt: document 'interactive.singlekey'
11219 git-stash.txt: better docs for '--patch'
11220 git-checkout.txt: better docs for '--patch'
11221 git-reset.txt: better docs for '--patch'
11223 Ævar Arnfjörð Bjarmason (7):
11224 i18n: mark merge "Could not read from" message for translation
11225 i18n: mark merge "upstream" messages for translation
11226 i18n: mark merge CHERRY_PICK_HEAD messages for translation
11227 i18n: mark clone nonexistent repository message for translation
11228 i18n: mark checkout --detach messages for translation
11229 i18n: mark checkout plural warning for translation
11230 i18n: mark init-db messages for translation
11233 Version v1.7.5.3; changes since v1.7.5.2:
11234 -----------------------------------------
11236 Felipe Contreras (1):
11237 git-completion: fix regression in zsh support
11239 Fraser Tweedale (1):
11240 gitweb: supply '-n' to gzip for identical output
11243 send-pack: unbreak push over stateless rpc
11244 cherry-pick: handle root commits with external strategies
11245 revert: allow reverting a root commit
11246 t3503: test cherry picking and reverting root commits
11247 connect: treat generic proxy processes like ssh processes
11248 connect: let callers know if connection is a socket
11249 send-pack: avoid deadlock on git:// push with failed pack-objects
11250 test core.gitproxy configuration
11253 do not read beyond end of malloc'd buffer
11256 Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
11257 send-pack: avoid deadlock when pack-object dies early
11258 Honor $(prefix) set in config.mak* when defining ETC_GIT*
11260 Jonathan Nieder (5):
11261 Revert "t0081 (line-buffer): add buffering tests"
11262 Documentation: explain how to check for patch corruption
11263 Documentation: hints for sending patches inline with Thunderbird
11264 Documentation: publicize KMail hints for sending patches inline
11265 Documentation: publicize hints for sending patches with GMail
11267 Junio C Hamano (4):
11268 Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
11269 setup_revisions(): take pathspec from command line and --stdin correctly
11270 sideband_demux(): fix decl-after-stmt
11274 Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
11276 Michael J Gruber (2):
11277 config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
11278 git-svn: Fix git svn log --show-commit
11280 Nguyễn Thái Ngọc Duy (1):
11281 init/clone: remove short option -L and document --separate-git-dir
11283 Rafael Gieschke (1):
11284 copy_gecos: fix not adding nlen to len when processing "&"
11286 Stefan Sperling (1):
11287 remove noise and inaccuracies from git-svn docs
11290 Version v1.7.5.2; changes since v1.7.5.1:
11291 -----------------------------------------
11294 git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
11296 Brian Gernhardt (1):
11297 t/annotate-tests: Use echo & cat instead of sed
11299 Carlos Martín Nieto (2):
11300 format-patch: don't pass on the --quiet flag
11301 format-patch: document --quiet option
11304 Pass empty file to p4merge where no base is suitable.
11307 shell: add missing initialization of argv0_path
11310 Look for password in both CVS and CVSNT password files.
11312 Jakub Narębski (2):
11313 git-instaweb: Simplify build dependency on gitweb
11314 Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
11317 pretty: quote rfc822 specials in email addresses
11318 add tests for merge-index / merge-one-file
11319 merge-one-file: fix broken merges with alternate work trees
11322 Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
11325 t5400: Fix a couple of typos
11327 Jonathan Nieder (4):
11328 Restructure documentation for git-merge-base.
11329 Documentation: describe the format of messages with inline patches
11330 add, merge, diff: do not use strcasecmp to compare config variable names
11331 provide a copy of the LGPLv2.1
11334 mergetool: Teach about submodules
11337 blame: tolerate bogus e-mail addresses a bit better
11340 Remove duplicated "is a"
11342 Junio C Hamano (19):
11343 test: use $_z40 from test-lib
11344 diff.c: return filepair from diff_unmerge()
11345 diff: remove often unused parameters from diff_unmerge()
11346 diff-files: show unmerged entries correctly
11347 Fix "add -u" that sometimes fails to resolve unmerged paths
11348 add -p: 'q' should really quit
11349 t3701: Editing a split hunk in an "add -p" session
11350 add--interactive.perl: factor out repeated --recount option
11351 "add -p": work-around an old laziness that does not coalesce hunks
11352 t3701: fix here document
11353 merge: make branch.<name>.mergeoptions correctly override merge.<option>
11354 t3701: add-p-fix makes the last test to pass
11355 t1507: avoid "${parameter<op>'word'}" inside double-quotes
11356 Prepare for 1.7.5.2
11358 git_open_noatime(): drop unused parameter
11359 Update draft release notes to 1.7.5.2
11360 Update draft release notes to 1.7.5.2
11363 Martin von Zweigbergk (1):
11364 diffcore-rename: don't consider unmerged path as source
11366 Michael J Gruber (1):
11367 git-fast-import.txt: --relative-marks takes no parameter
11369 Sebastian Schuberth (1):
11370 doc: Clarify that "cherry-pick -x" does not use "git notes"
11372 Sverre Rabbelier (1):
11373 fast-import: fix option parser for no-arg options
11375 Valentin Haenel (3):
11376 git-svn.txt: fix usage of --add-author-from
11377 git-svn.txt: move option descriptions
11378 git-svn.txt: small typeface improvements
11380 Vincent van Ravesteijn (1):
11381 Documentation: update to git-merge-base --octopus
11384 Version v1.7.5.1; changes since v1.7.5:
11385 ---------------------------------------
11388 clean: unreadable directory may still be rmdir-able if it is empty
11391 stash: add two more tests for --no-keep-index
11392 stash: ensure --no-keep-index and --patch can be used in any order
11395 stash: fix accidental apply of non-existent stashes
11396 stash: drop dirty worktree check on apply
11397 upload-pack: start pack-objects before async rev-list
11400 --dirstat: Describe non-obvious differences relative to --stat or regular diff
11401 --dirstat-by-file: Make it faster and more correct
11402 Teach --dirstat not to completely ignore rearranged lines within a file
11403 --dirstat: In case of renames, use target filename instead of source filename
11406 stash: fix false positive in the invalid ref test.
11408 Junio C Hamano (4):
11409 Teach core.bigfilethreashold to pack-objects
11410 http: clear POSTFIELDS when initializing a slot
11411 Start 1.7.5.1 maintenance track
11414 Michael J Gruber (6):
11415 builtin/log.c: separate default and setup of cmd_log_init()
11416 t/t1411: test reflog with formats
11417 reflog: fix overriding of command line options
11418 t1506: factor out test for "Did you mean..."
11419 sha1_name: Suggest commit:./file for path in subdir
11420 date: avoid "X years, 12 months" in relative dates
11423 git-send-email: fix missing space in error message
11425 Valentin Haenel (1):
11426 git-add.txt: document 'add.ignoreErrors'
11429 Version v1.7.5; changes since v1.7.5-rc3:
11430 -----------------------------------------
11432 Junio C Hamano (1):
11436 Version v1.7.5-rc3; changes since v1.7.5-rc2:
11437 ---------------------------------------------
11439 Junio C Hamano (3):
11440 Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
11444 Michael J Gruber (3):
11445 git.txt: fix list continuation
11446 t3306,t5304: avoid clock skew issues
11447 git-svn.txt: Document --mergeinfo
11450 archive: document limitation of tar.umask config setting
11453 Version v1.7.5-rc2; changes since v1.7.5-rc1:
11454 ---------------------------------------------
11456 Alejandro R. Sedeño (1):
11457 git-svn: Add a svn-remote.<name>.pushurl config key
11459 Anders Kaseorg (2):
11460 gitk: Take only numeric version components when computing $git_version
11461 gitk: Update cherry-pick error message parsing
11464 git-p4: replace each tab with 8 spaces for consistency
11466 James Y Knight (1):
11467 git-svn: Cache results of running the executable "git config"
11470 remove doubled words, e.g., s/to to/to/, and fix related typos
11473 t0001: guard a new test with SYMLINKS prerequisite
11474 t2021: mark a test as fixed
11476 Junio C Hamano (1):
11480 gitk: Quote tag names in event bindings to avoid problems with % chars
11482 Paul Mackerras (1):
11483 gitk: Allow user to control how much of the SHA1 ID gets auto-selected
11485 Ramkumar Ramachandra (1):
11486 revert: Hide '-r' option in default usage
11488 Ramsay Allan Jones (1):
11489 i18n: avoid parenthesized string as array initializer
11492 gitk: spelling fixes in Russian translation
11494 Ævar Arnfjörð Bjarmason (1):
11495 Makefile: extract Q_() source strings as ngettext()
11498 Version v1.7.5-rc1; changes since v1.7.5-rc0:
11499 ---------------------------------------------
11502 Remove old binaries from .gitignore
11503 Fix two unused variable warnings in gcc 4.6
11505 Jakub Narębski (1):
11506 gitweb: Fix parsing of negative fractional timezones in JavaScript
11509 merge: match the help text with the documentation
11512 merge: merge unborn index before setting ref
11513 pull: do not clobber untracked files on initial pull
11514 remote: disallow some nonsensical option combinations
11515 remote: separate the concept of push and fetch mirrors
11516 remote: deprecate --mirror
11517 docs: fix filter-branch subdir example for exotic repo names
11518 pull: do not clobber untracked files on initial pull
11521 fetch/pull: recurse into submodules when necessary
11522 fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
11523 config: teach the fetch.recurseSubmodules option the 'on-demand' value
11524 Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
11525 fetch/pull: Don't recurse into a submodule when commits are already present
11526 submodule update: Don't fetch when the submodule commit is already present
11527 fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
11530 grep: allow -E and -n to be turned on by default via configuration
11532 Jonathan Nieder (1):
11533 compat: add missing #include <sys/resource.h>
11535 Junio C Hamano (8):
11536 merge: merge with the default upstream branch without argument
11537 "log --cherry-pick" documentation regression fix
11538 Doc: mention --delta-base-offset is the default for Porcelain commands
11540 Update release notes
11541 Start preparing for 1.7.4.4
11545 Lawrence Mitchell (1):
11546 git.el: Don't use font-lock-compile-keywords
11548 Michael J Gruber (3):
11549 revisions.txt: consistent use of quotes
11550 revisions.txt: structure with a labelled list
11551 revisions.txt: language improvements
11553 Nguyễn Thái Ngọc Duy (2):
11554 git-init.txt: move description section up
11555 init, clone: support --separate-git-dir for .git file
11557 Nicolas Morey-Chaisemartin (1):
11558 submodule: process conflicting submodules only once
11561 Documentation: trivial grammar fix in core.worktree description
11564 Makefile: Cover more files with make check
11565 sparse: Fix errors and silence warnings
11567 Ævar Arnfjörð Bjarmason (70):
11568 i18n: git-init basic messages
11569 i18n: git-init "Initialized [...] repository" message
11570 i18n: git-clone basic messages
11571 i18n: git-clone "Cloning into" message
11572 i18n: git-clone "Cloning into" message
11573 i18n: git-add basic messages
11574 i18n: git-add "The following paths are ignored" message
11575 i18n: git-add "did not match any files" message
11576 i18n: git-add "remove '%s'" message
11577 i18n: git-add "Unstaged changes" message
11578 i18n: git-branch basic messages
11579 i18n: git-branch "remote branch '%s' not found" message
11580 i18n: git-branch "Deleted branch [...]" message
11581 i18n: git-branch "git branch -v" messages
11582 i18n: git-branch "(no branch)" message
11583 i18n: git-checkout basic messages
11584 i18n: git-checkout: our/their version message
11585 i18n: git-checkout describe_detached_head messages
11586 i18n: git-checkout "HEAD is now at" message
11587 i18n: git-checkout "Switched to a .. branch" message
11588 i18n: git-commit basic messages
11589 i18n: git-commit "middle of a merge" message
11590 i18n: git-commit formatting messages
11591 i18n: git-commit print_summary messages
11592 i18n: git-commit "enter the commit message" message
11593 i18n: git-commit advice messages
11594 i18n: git-diff basic messages
11595 i18n: git-fetch basic messages
11596 i18n: git-fetch formatting messages
11597 i18n: git-fetch update_local_ref messages
11598 i18n: git-fetch split up "(non-fast-forward)" message
11599 i18n: git-grep basic messages
11600 i18n: git-grep "--open-files-in-pager" message
11601 i18n: git-log basic messages
11602 i18n: git-log "--OPT does not make sense" messages
11603 i18n: git-merge basic messages
11604 i18n: git-merge "Updating %s..%s" message
11605 i18n: git-merge "You have not concluded your merge" messages
11606 i18n: git-merge "Wonderful" message
11607 i18n: git-mv basic messages
11608 i18n: git-mv "bad" messages
11609 i18n: git-rm basic messages
11610 i18n: git-reset basic messages
11611 i18n: git-reset reset_type_names messages
11612 i18n: git-reset "Unstaged changes after reset" message
11613 i18n: git-tag basic messages
11614 i18n: git-tag tag_template message
11615 i18n: git-push basic messages
11616 i18n: git-push "prevent you from losing" message
11617 i18n: git-status basic messages
11618 i18n: git-status "nothing to commit" messages
11619 i18n: git-status shortstatus messages
11620 i18n: git-status "Changes to be committed" message
11621 i18n: git-status "Initial commit" message
11622 i18n: git-status "renamed: " message
11623 i18n: git-archive basic messages
11624 i18n: git-bundle basic messages
11625 i18n: git-clean basic messages
11626 i18n: git-clean clean.requireForce messages
11627 i18n: git-describe basic messages
11628 i18n: git-gc basic messages
11629 i18n: git-gc "Auto packing the repository" message
11630 i18n: git-notes basic commands
11631 i18n: git-notes GIT_NOTES_REWRITE_MODE error message
11632 i18n: git-revert basic messages
11633 i18n: git-revert "Your local changes" message
11634 i18n: git-revert literal "me" messages
11635 i18n: git-revert split up "could not revert/apply" message
11636 i18n: git-shortlog basic messages
11637 t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
11640 Version v1.7.5-rc0; changes since v1.7.4.5:
11641 -------------------------------------------
11644 git-gui: update russian translation
11645 git-gui: update russian translation
11647 Alexandre Erwin Ittner (1):
11648 git-gui: add Brazilian Portuguese (pt-BR) translation
11651 git-gui: fix ANSI-color parsing
11652 git-gui: respect conflict marker size
11653 git-gui: fix browsers [Up To Parent] in sub-sub-directories.
11654 git-gui: Fix use of renamed tag.
11655 git-gui: Fix use of hunk tag for non-hunk content.
11656 git-gui: fix typo in image data
11657 git-gui: remove 'no such variable' for s error when encounter unknown file states
11658 git-gui: learn more type change states
11659 git-gui: rework handling of diff header
11660 git-gui: handle index lines only in the diff header
11661 git-gui: name also new symlinks so
11662 git-gui: there is no "mode *" diff header line
11663 git-gui: move 3way diff autodetect up
11664 git-gui: always reset the current tag
11665 git-gui: handle special content lines only in the diff header section
11666 git-gui: handle meta diff header lines only in the header section
11668 Carlo Marcelo Arenas Belon (1):
11669 setup: translate symlinks in filename when using absolute paths
11671 Carlos Martín Nieto (1):
11672 Name make_*_path functions more accurately
11675 vcs-svn: Allow simple v3 dumps (no deltas yet)
11676 vcs-svn: Implement Prop-delta handling
11677 fast-import: add 'ls' command
11678 vcs-svn: use strbuf for revision log
11679 vcs-svn: use strbuf for author, UUID, and URL
11680 vcs-svn: implement perfect hash for node-prop keys
11681 vcs-svn: implement perfect hash for top-level keys
11682 vcs-svn: use strchr to find RFC822 delimiter
11685 Documentation: "rebase <onto> <that>" stays on <that> branch upon exit
11688 Make rev-list --objects work together with pathspecs
11689 Add testcases showing how pathspecs are handled with rev-list --objects
11691 Erik Faye-Lund (1):
11692 alias: use run_command api to execute aliases
11694 Giuseppe Bilotta (1):
11695 Improve test for pthreads flag
11698 git gui: keep selected branch when remote is changed in push dialog
11699 git-gui: scroll down to default selection for push dialog
11700 git-gui: instead of defaulting to home directory use working directory
11701 mingw: move unlink wrapper to mingw.c
11702 mingw: work around irregular failures of unlink on windows
11703 mingw: make failures to unlink or move raise a question
11704 mingw: add fallback for rmdir in case directory is in use
11705 git-gui: fix deleting item from all_remotes variable
11706 git-gui: always default to the last merged branch in remote delete
11707 git-gui: refactor remote submenu creation into subroutine
11708 git-gui: teach fetch/prune menu to do it for all remotes
11709 git-gui: fetch/prune all entry only for more than one entry
11710 git-gui: fetch/prune all entry appears last
11713 Obey p4 views when using client spec
11716 object.h: Remove obsolete struct object_refs
11717 git-completion: Add git help completion for aliases
11719 Jakub Narębski (1):
11720 gitweb: Make i18n (encoding) tests in t9500 leave clean state
11723 git-checkout.txt: improve detached HEAD documentation
11724 Introduce CHERRY_PICK_HEAD
11725 bash: teach __git_ps1 about CHERRY_PICK_HEAD
11726 Teach commit about CHERRY_PICK_HEAD
11729 merge: improve inexact rename limit warning
11730 bump rename limit defaults (again)
11731 commit: stop setting rename limit
11732 add inexact rename detection progress infrastructure
11733 merge: enable progress reporting for rename detection
11734 pull: propagate --progress to merge
11735 compat: provide a fallback va_copy definition
11736 strbuf: add strbuf_vaddf
11737 trace: add trace_vprintf
11738 trace: refactor to support multiple env variables
11739 trace: factor out "do we want to trace" logic
11740 trace: add trace_strbuf
11741 add packet tracing debug code
11742 trace: give repo_setup trace its own key
11743 doc: drop author/documentation sections from most pages
11744 doc: add missing git footers
11745 docs: point git.txt author credits to git-scm.com
11746 checkout: add basic tests for detached-orphan warning
11747 checkout: clear commit marks after detached-orphan check
11748 checkout: tweak detached-orphan warning format
11749 t7607: mark known breakage in test 11 as fixed
11750 t7607: clean up stray untracked file
11751 tests: kill backgrounded processes more robustly
11754 tests: fix overeager scrubbing of environment variables
11756 Johannes Schindelin (2):
11757 mingw_rmdir: set errno=ENOTEMPTY when appropriate
11758 Remove unused variables
11761 rerere forget: deprecate invocation without pathspec
11763 Jonathan Nieder (75):
11764 vcs-svn: Check for errors from open()
11765 vcs-svn: Eliminate node_ctx.srcRev global
11766 vcs-svn: Eliminate node_ctx.mark global
11767 vcs-svn: Unclutter handle_node by introducing have_props var
11768 vcs-svn: Use mark to indicate nodes with included text
11769 vcs-svn: handle_node: Handle deletion case early
11770 vcs-svn: Replace = Delete + Add
11771 vcs-svn: Combine repo_replace and repo_modify functions
11772 vcs-svn: Delay read of per-path properties
11773 vcs-svn: Reject path nodes without Node-action
11774 vcs-svn: More dump format sanity checks
11775 vcs-svn: Make source easier to read on small screens
11776 vcs-svn: Split off function for handling of individual properties
11777 vcs-svn: Sharpen parsing of property lines
11778 vcs-svn: Allow change nodes for root of tree (/)
11779 cherry-pick/revert: add support for -X/--strategy-option
11780 unpack-trees: handle lstat failure for existing directory
11781 unpack-trees: handle lstat failure for existing file
11782 userdiff: simplify word-diff safeguard
11783 t4034 (diff --word-diff): style suggestions
11784 glossary: define pathspec
11785 checkout: split off a function to peel away branchname arg
11786 checkout: rearrange update_refs_for_switch for clarity
11787 t3507: introduce pristine-detach helper
11788 checkout: add missing const to describe_detached_head
11789 update-index --refresh --porcelain: add missing const
11790 vcs-svn: eliminate global byte_buffer
11791 vcs-svn: replace buffer_read_string memory pool with a strbuf
11792 vcs-svn: collect line_buffer data in a struct
11793 vcs-svn: teach line_buffer to handle multiple input files
11794 vcs-svn: make test-line-buffer input format more flexible
11795 tests: give vcs-svn/line_buffer its own test script
11796 vcs-svn: tweak test-line-buffer to not assume line-oriented input
11797 t0081 (line-buffer): add buffering tests
11798 vcs-svn: add binary-safe read function
11799 vcs-svn: allow character-oriented input
11800 vcs-svn: allow input from file descriptor
11801 vcs-svn: teach line_buffer about temporary files
11802 fast-import: make code "-Wpointer-arith" clean
11803 vcs-svn: introduce repo_read_path to check the content at a path
11804 vcs-svn: handle_node: use repo_read_path
11805 vcs-svn: simplify repo_modify_path and repo_copy
11806 vcs-svn: allow input errors to be detected promptly
11807 compat: fall back on __va_copy if available
11808 wt-status: add helpers for printing wt-status lines
11809 commit: refer to commit template as s->fp
11810 commit, status: use status_printf{,_ln,_more} helpers
11811 i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
11812 wt-status: add helpers for printing wt-status lines
11813 commit: refer to commit template as s->fp
11814 commit, status: use status_printf{,_ln,_more} helpers
11815 i18n: add stub Q_() wrapper for ngettext
11816 i18n: "make distclean" should clean up after "make pot"
11817 tests: stop worrying about obsolete environment variables
11818 tests: suppress system gitattributes
11819 gitattributes: drop support for GIT_ATTR_NOGLOBAL
11820 config: drop support for GIT_CONFIG_NOGLOBAL
11821 tests: scrub environment of GIT_* variables
11822 declare 1-bit bitfields to be unsigned
11823 vcs-svn: remove spurious semicolons
11824 mktag: avoid %td in format string
11825 unbreak and eliminate NO_C99_FORMAT
11826 run-command: prettify -D_FORTIFY_SOURCE workaround
11827 vcs-svn: improve support for reading large files
11828 vcs-svn: make buffer_skip_bytes return length read
11829 vcs-svn: make buffer_copy_bytes return length read
11830 vcs-svn: improve reporting of input errors
11831 tests: avoid nonportable {foo,bar} glob
11832 vcs-svn: make reading of properties binary-safe
11833 vcs-svn: remove buffer_read_string
11834 vcs-svn: avoid unnecessary copying of log message and author
11835 vcs-svn: handle log message with embedded NUL
11836 vcs-svn: add missing cast to printf argument
11837 vcs-svn: add missing cast to printf argument
11838 tests: make sure input to sed is newline terminated
11840 Junio C Hamano (29):
11841 unpack-trees.c: cosmetic fix
11842 unpack_trees(): skip trees that are the same in all input
11843 t4034 (diff --word-diff): add a minimum Perl drier test vector
11844 t6004: add pathspec globbing test for log family
11845 checkout: introduce --detach synonym for "git checkout foo^{commit}"
11846 Rename t2019 with typo "amiguous" that meant "ambiguous"
11847 Revert "unpack_trees(): skip trees that are the same in all input"
11848 grep --no-index: honor pathspecs correctly
11849 rev-list: --left/right-only are mutually exclusive
11850 commit: give final warning when reattaching HEAD to leave commits behind
11851 Start preparing release notes to 1.7.5
11852 Update Release Notes to 1.7.5
11853 Update draft release notes to 1.7.5
11854 refs_from_alternate: helper to use refs from alternates
11855 fetch-pack: objects in our alternates are available to us
11856 fetch-pack: factor out hardcoded handshake window size
11857 fetch-pack: progressively use larger handshake windows
11858 fetch-pack: use smaller handshake window for initial request
11859 Update drart release notes to 1.7.5
11860 Update draft release notes to 1.7.5
11861 rerere: make sure it works even in a workdir attached to a young repository
11862 Update draft release note to 1.7.5
11863 Revert "upload-pack: Implement no-done capability"
11864 Revert "fetch-pack: Implement no-done capability"
11865 enable "no-done" extension only when fetching over smart-http
11866 Fix potential local deadlock during fetch-pack
11867 enable "no-done" extension only when serving over smart-http
11868 Revert two "no-done" reverts
11871 Kevin Cernekee (1):
11872 gitweb: fix #patchNN anchors when path_info is enabled
11874 Martin von Zweigbergk (2):
11876 mergetool: don't skip modify/remove conflicts
11879 push: better error messages when push.default = tracking
11880 push: better error message when no remote configured
11882 Michael Horowitz (1):
11883 git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
11885 Michael J Gruber (14):
11886 revlist.c: introduce --left/right-only for unsymmetric picking
11887 t6007: Make sure we test --cherry-pick
11888 rev-list: documentation and test for --left/right-only
11889 git-add: make -A description clearer vs. -u
11890 rev-list/log: factor out revision mark generation
11891 revision.c: introduce --cherry-mark
11892 rev-list: documentation and test for --cherry-mark
11893 log --cherry: a synonym
11894 t6007: test rev-list --cherry
11895 git-log: put space after commit mark
11896 RelNotes/1.7.5.txt: typo and language fixes
11897 t6009: use test_commit() from test-lib.sh
11898 revision.c: introduce --min-parents and --max-parents options
11899 rev-list --min-parents,--max-parents: doc, test and completion
11901 Michael Witten (1):
11902 vcs-svn: a void function shouldn't try to return something
11904 Nguyễn Thái Ngọc Duy (22):
11905 Add struct pathspec
11906 diff-no-index: use diff_tree_setup_paths()
11907 Convert struct diff_options to use struct pathspec
11908 tree_entry_interesting(): remove dependency on struct diff_options
11909 Move tree_entry_interesting() to tree-walk.c and export it
11910 diff-tree: convert base+baselen to writable strbuf
11911 tree_entry_interesting(): refactor into separate smaller functions
11912 tree_entry_interesting(): support depth limit
11913 tree_entry_interesting(): fix depth limit with overlapping pathspecs
11914 tree_entry_interesting(): support wildcard matching
11915 tree_entry_interesting(): optimize wildcard matching when base is matched
11916 pathspec: add match_pathspec_depth()
11917 struct rev_info: convert prune_data to struct pathspec
11918 Convert ce_path_match() to use struct pathspec
11919 Convert ce_path_match() to use match_pathspec_depth()
11920 grep: convert to use struct pathspec
11921 grep: use match_pathspec_depth() for cache/worktree grepping
11922 grep: use writable strbuf from caller for grep_tree()
11923 grep: drop pathspec_matches() in favor of tree_entry_interesting()
11924 t7810: overlapping pathspecs and depth limit
11925 Make hash-object more robust against malformed objects
11926 git.c: reorder builtin command list
11928 Nicolas Kaiser (1):
11929 transport-helper.c: fix check for (size_t < 0)
11932 git-gui: Include version check and test for tearoff menu entry
11933 git-gui: detect the use of MUI langauge packs on Windows
11936 git-p4: test script
11937 git-p4: fix key error for p4 problem
11938 git-p4: add missing newline in initial import message
11939 git-p4: accommodate new move/delete type in p4
11940 git-p4: reinterpret confusing p4 message
11941 git-p4: better message for "git-p4 sync" when not cloned
11942 git-p4: decode p4 wildcard characters
11943 git-p4: support clone --bare
11944 git-p4: fix clone @all regression
11945 git-p4: test clone @all
11946 git-p4: fix sync new branch regression
11947 git-p4: test sync new branch
11949 Piotr Krukowiecki (1):
11950 Documentation: running test with --debug keeps "trash" directory
11952 Ramkumar Ramachandra (1):
11953 fast-import: Introduce --import-marks-if-exists
11956 repo-config: add deprecation warning
11957 grep: read patterns from stdin with -f -
11960 bash: fix misindented esac statement in __git_complete_file()
11961 bash: complete 'git diff ...branc<TAB>'
11963 Sebastian Schuberth (4):
11964 mergetool--lib: Sort tools alphabetically for easier lookup
11965 mergetool--lib: Add Beyond Compare 3 as a tool
11966 mergetool--lib: Sort tools alphabetically for easier lookup
11967 mergetool--lib: Add Beyond Compare 3 as a tool
11969 Serge Ziryukin (1):
11970 git-gui: fix russian translation typos
11972 Shawn O. Pearce (6):
11973 smart-http: Don't use Expect: 100-Continue
11974 smart-http: Really never use Expect: 100-continue
11975 fetch-pack: Finish negotation if remote replies "ACK %s ready"
11976 upload-pack: More aggressively send 'ACK %s ready'
11977 fetch-pack: Implement no-done capability
11978 upload-pack: Implement no-done capability
11981 git-gui: spelling fixes in russian translation
11984 git-gui: use --exclude-standard to check for untracked files
11987 Fix sparse warnings
11990 Exhibit merge bug that clobbers index&WT
11991 t4034: bulk verify builtin word regex sanity
11993 Tor Arvid Lund (3):
11994 git-p4: Teach gitConfig method about arguments.
11995 Teach git-p4 to ignore case in perforce filenames if configured.
11996 git-p4: Fix error message crash in P4Sync.commit.
11998 Uwe Kleine-König (2):
11999 get_remote_url(): use the same data source as ls-remote to get remote urls
12000 git-request-pull: open-code the only invocation of get_remote_url
12003 git-p4: Improve rename detection support
12004 git-p4: Add copy detection support
12006 Ævar Arnfjörð Bjarmason (4):
12007 gitignore: add test-mktemp to ignore list
12008 i18n: add no-op _() and N_() wrappers
12009 i18n: add GETTEXT_POISON to simulate unfriendly translator
12010 i18n: Makefile: "pot" target to extract messages marked for translation
12013 Version v1.7.4.5; changes since v1.7.4.4:
12014 -----------------------------------------
12017 t2021: mark a test as fixed
12019 Junio C Hamano (2):
12020 "log --cherry-pick" documentation regression fix
12023 Michael J Gruber (3):
12024 git.txt: fix list continuation
12025 t3306,t5304: avoid clock skew issues
12026 git-svn.txt: Document --mergeinfo
12029 archive: document limitation of tar.umask config setting
12032 Version v1.7.4.4; changes since v1.7.4.3:
12033 -----------------------------------------
12035 Jakub Narębski (2):
12036 git-instaweb: Change how gitweb.psgi is made runnable as standalone app
12037 gitweb: Fix parsing of negative fractional timezones in JavaScript
12040 strbuf: add fixed-length version of add_wrapped_text
12041 format-patch: wrap long header lines
12042 format-patch: rfc2047-encode newlines in headers
12043 pull: do not clobber untracked files on initial pull
12045 Jonathan Nieder (1):
12046 compat: add missing #include <sys/resource.h>
12048 Junio C Hamano (6):
12049 list-objects.c: don't add an unparsed NULL as a pending tree
12050 Rename core.abbrevlength back to core.abbrev
12051 diff/status: refactor opportunistic index update
12052 update $GIT_INDEX_FILE when there are racily clean entries
12053 Start preparing for 1.7.4.4
12056 Libor Pechacek (2):
12057 Sanity-check config variable names
12058 Disallow empty section and variable names
12060 Linus Torvalds (1):
12061 Make the default abbrev length configurable
12064 log: fix --max-count when used together with -S or -G
12066 Michael J Gruber (2):
12067 git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
12068 git-log.txt,rev-list-options.txt: put option blocks in proper order
12070 Nicolas Morey-Chaisemartin (1):
12071 submodule: process conflicting submodules only once
12074 Documentation: trivial grammar fix in core.worktree description
12077 Version v1.7.4.3; changes since v1.7.4.2:
12078 -----------------------------------------
12081 HOME must be set before calling git-init when creating test repositories
12083 Carlos Martín Nieto (1):
12084 Documentation/config.txt: make truth value of numbers more explicit
12086 Clemens Buchacher (1):
12087 do not overwrite untracked symlinks
12090 git-cvsimport.perl: Bail out right away when reading from the server fails
12093 docs: fix filter-branch subdir example for exotic repo names
12096 grep: Add the option '--line-number'
12099 branch/checkout --track: Ensure that upstream branch is indeed a branch
12102 Demonstrate breakage: checkout overwrites untracked symlink with directory
12103 stash: fix incorrect quoting in cleanup of temporary files
12104 stash: copy the index using --index-output instead of cp -p
12106 Junio C Hamano (9):
12107 checkout: fix bug with ambiguous refs
12108 apply: do not patch lines that were already patched
12109 apply -v: show offset count when patch did not apply exactly
12110 diff --quiet: disable optimization when --diff-filter=X is used
12111 doc: technical details about the index file format
12112 t8001: check the exit status of the command being tested
12113 parse-remote: typofix
12114 Doc: mention --delta-base-offset is the default for Porcelain commands
12118 contrib/thunderbird-patch-inline: do not require bash to run the script
12120 Michael J Gruber (2):
12121 git-bisect.txt: streamline run presentation
12122 git-bisect.txt: example for bisecting with hot-fix
12124 Michael Witten (3):
12125 git tag documentation grammar fixes and readability updates
12127 strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead
12129 Nguyễn Thái Ngọc Duy (1):
12130 doc: technical details about the index file format
12132 Piotr Krukowiecki (2):
12133 git stash: show status relative to current directory
12134 Add test: git stash shows status relative to current dir
12137 parse-remote: replace unnecessary sed invocation
12138 git-pack-objects.txt: fix grammatical errors
12141 Version v1.7.4.2; changes since v1.7.4.1:
12142 -----------------------------------------
12145 diff format documentation: clarify --cc and -c
12148 Documentation: remove redundant colons in git-for-each-ref.txt
12149 Add Author and Documentation sections to git-for-each-ref.txt
12150 docs: fix grammar in gitattributes.txt
12152 Arnout Engelen (1):
12153 Improve error messages when temporary file creation fails
12156 Work around broken ln on solaris as used in t8006
12158 Carlos Martín Nieto (3):
12159 valgrind: ignore SSE-based strlen invalid reads
12160 make_absolute_path: return the input path if it points to our buffer
12161 t/README: Add a note about running commands under valgrind
12163 Clemens Buchacher (1):
12164 Documentation: clarify -u<mode> option defaults
12167 branch_merged: fix grammar in warning
12169 Erik Faye-Lund (1):
12170 mingw: add minimum getrlimit() compatibility stub
12172 Jakub Narębski (2):
12173 gitweb: Always call parse_date with timezone parameter
12174 gitweb: Fix handling of fractional timezones in parse_date
12177 merge: honor prepare-commit-msg hook
12180 string_list_append: always set util pointer to NULL
12181 clone: die when trying to clone missing local path
12182 diff: handle diffstat of rewritten binary files
12183 diff: don't retrieve binary blobs for diffstat
12184 bisect: visualize with git-log if gitk is unavailable
12187 push.default: Rename 'tracking' to 'upstream'
12189 Jonathan Nieder (9):
12190 correct type of EMPTY_TREE_SHA1_BIN
12191 tests: skip terminal output tests on OS X
12192 commit: error out for missing commit message template
12193 enums: omit trailing comma for portability
12194 compat: make gcc bswap an inline function
12195 standardize brace placement in struct definitions
12196 branch: split off function that writes tracking info and commit subject
12197 cherry: split off function to print output lines
12198 diff --submodule: split into bite-sized pieces
12200 Junio C Hamano (8):
12201 CodingGuidelines: downcase placeholders in usage messages
12202 verify-pack: add --stat-only to the synopsis section
12203 SubmittingPatches: clarify the expected commit log description
12204 Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
12205 Prepare draft release notes to 1.7.4.2
12206 bisect: explain the rationale behind 125
12207 Update draft release notes to 1.7.4.2
12210 Kevin Cernekee (1):
12211 gitweb: highlight: replace tabs with spaces
12213 Linus Torvalds (3):
12214 for_each_hash: allow passing a 'void *data' pointer to callback
12215 diffcore-rename: properly honor the difference between -M and -C
12216 diffcore-rename: improve estimate_similarity() heuristics
12218 Masatake Osanai (1):
12219 perl: command_bidi_pipe() method should set-up git environmens
12221 Mathias Lafeldt (1):
12222 Fix typo in t/README
12224 Michael J Gruber (16):
12225 commit,tag: use same wording for -F
12226 commit,status: describe --porcelain just like push
12227 clone,init: describe --template using the same wording
12228 commit,merge,tag: describe -m likewise
12229 add: describe --patch like checkout, reset
12230 commit,status: describe -u likewise
12231 git-tag.txt: list all modes in the description
12232 pull: do not display fetch usage on --help-all
12233 Make <identifier> lowercase as per CodingGuidelines
12234 Make <identifier> lowercase as per CodingGuidelines
12235 Make <identifier> lowercase as per CodingGuidelines
12236 Make <identifier> lowercase in Documentation
12237 git-patch-id: test for "no newline" markers
12238 git-patch-id: do not trip over "no newline" markers
12239 mergetool-lib: call vim in readonly mode for diffs
12240 rev-list-options.txt: typo fix
12243 Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
12244 git-compat-util.h: Honor HP C's noreturn attribute
12246 Michał Kiedrowicz (1):
12247 Documentation: fix a typo in git-apply.txt
12249 Nguyễn Thái Ngọc Duy (2):
12250 parse_tag_buffer(): do not prefixcmp() out of range
12251 init: remove unnecessary check
12253 Piotr Krukowiecki (1):
12254 ls-remote documentation: <refs> argument is optional
12256 Ralf Wildenhues (1):
12257 configure: use AC_LANG_PROGRAM consistently
12260 git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
12262 Shawn O. Pearce (2):
12263 Limit file descriptors used by packs
12264 sha1_file.c: Don't retain open fds on small packs
12266 Spencer E. Olson (2):
12267 submodule: no [--merge|--rebase] when newly cloned
12268 t7406: "git submodule update {--merge|--rebase]" with new submodules
12270 Ævar Arnfjörð Bjarmason (4):
12271 gitweb/gitweb.perl: remove use of qw(...) as parentheses
12272 gitweb/gitweb.perl: don't call S_ISREG() with undef
12273 t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
12274 t/t7500-commit.sh: use test_cmp instead of test
12277 Version v1.7.4.1; changes since v1.7.4:
12278 ---------------------------------------
12281 clone: fixup recurse_submodules option
12283 Jakub Narębski (1):
12284 gitweb: Mention optional Perl modules in INSTALL
12287 t5526: Fix wrong argument order in "git config"
12288 pull: Document the "--[no-]recurse-submodules" options
12291 start_command: flush buffers in the WIN32 code path as well
12292 t4120-apply-popt: help systems with core.filemode=false
12294 Jonathan Nieder (5):
12295 quote.h: simplify the inclusion
12296 fast-import: clarify documentation of "feature" command
12297 fast-import: introduce "feature notes" command
12298 compat: helper for detecting unsigned overflow
12299 svn-fe: warn about experimental status
12301 Junio C Hamano (3):
12302 fsck: drop unused parameter from traverse_one_object()
12303 fsck: do not give up too early in fsck_dir()
12306 Nguyễn Thái Ngọc Duy (4):
12307 diff: support --cached on unborn branches
12308 Add const to parse_{commit,tag}_buffer()
12309 sha1_file.c: move find_cached_object up so sha1_object_info can use it
12310 sha1_object_info: examine cached_object store too
12313 t3509: use unconstrained initial test to setup repository.
12314 t7407: fix line endings for mingw build
12316 Shawn O. Pearce (1):
12317 bundle: Use OFS_DELTA in bundle files
12319 Sitaram Chamarty (1):
12320 post-receive-email: suppress error if description file missing
12322 Uwe Kleine-König (1):
12323 Documentation/merge subtree How-To: fix typo
12326 Version v1.7.4; changes since v1.7.4-rc3:
12327 -----------------------------------------
12330 Don't pass "--xhtml" to hightlight in gitweb.perl script.
12333 rebase: use explicit "--" with checkout
12334 rebase: give a better error message for bogus branch
12335 tests: sanitize more git environment variables
12337 Jonathan Nieder (2):
12338 fast-import: treat filemodify with empty tree as delete
12339 rebase -i: clarify in-editor documentation of "exec"
12341 Junio C Hamano (1):
12345 Version v1.7.4-rc3; changes since v1.7.4-rc2:
12346 ---------------------------------------------
12348 Alexey Shumkin (1):
12349 userdiff: match Pascal class methods
12351 Björn Steinbrink (1):
12352 Correctly report corrupted objects
12354 Erik Faye-Lund (1):
12355 exec_cmd: remove unused extern
12358 Fix expected values of setup tests on Windows
12359 t/README: hint about using $(pwd) rather than $PWD in tests
12361 Jonathan Nieder (9):
12362 ll-merge: simplify opts == NULL case
12363 Documentation/fast-import: capitalize beginning of sentence
12364 remote-ext: do not segfault for blank lines
12365 Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
12366 tests: cosmetic improvements to the repo-setup test
12367 tests: compress the setup tests
12368 Documentation: do not treat reset --keep as a special case
12369 Subject: setup: officially support --work-tree without --git-dir
12370 t1510: fix typo in the comment of a test
12372 Junio C Hamano (2):
12373 Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase
12376 Ramsay Allan Jones (1):
12377 svndump.c: Fix a printf format compiler warning
12380 Version v1.7.4-rc2; changes since v1.7.4-rc1:
12381 ---------------------------------------------
12383 Anders Kaseorg (1):
12384 Mark gitk script executable
12387 trace.c: ensure NULL is not passed to printf
12388 t0001,t1510,t3301: use sane_unset which always returns with status 0
12389 t3032: limit sed branch labels to 8 characters
12392 docs: explain diff.*.binary option
12394 Jonathan Nieder (3):
12395 diff: funcname and word patterns for perl
12396 gitweb: make logo optional
12397 t9010: svnadmin can fail even if available
12399 Junio C Hamano (2):
12400 userdiff/perl: catch BEGIN/END/... and POD as headers
12404 commit: suggest --amend --reset-author to fix commiter identity
12406 Michael J Gruber (1):
12407 RelNotes/1.7.4: minor fixes
12409 Ramsay Allan Jones (7):
12410 lib-git-svn.sh: Move web-server handling code into separate function
12411 t9157-*.sh: Add an svn version check
12412 t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
12413 t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
12414 t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
12415 t4135-*.sh: Skip the "backslash" tests on cygwin
12416 t9157-*.sh: Make the svn version check more precise
12419 git svn: fix the final example in man page
12422 gitweb: add extensions to highlight feature map
12423 gitweb: remove unnecessary test when closing file descriptor
12426 Documentation/git-archive: spell --worktree-attributes correctly
12427 Documentation/githooks: post-rewrite-copy-notes never existed
12428 submodule: fix relative url parsing for scp-style origin
12429 t0000: quote TAP snippets in test code
12432 Version v1.7.4-rc1; changes since v1.7.4-rc0:
12433 ---------------------------------------------
12435 Antonio Ospite (1):
12436 t/t9001-send-email.sh: fix '&&' chain in some tests
12438 Jonathan Nieder (3):
12439 vcs-svn: Error out for v3 dumps
12440 gitweb: skip logo in atom feed when there is none
12441 daemon: support <directory> arguments again
12443 Junio C Hamano (3):
12444 t0021: avoid getting filter killed with SIGPIPE
12448 Michael J Gruber (2):
12449 cvsimport: partial whitespace cleanup
12450 cvsimport: handle the parsing of uppercase config options
12453 convert filter: supply path to external driver
12455 Ralf Wildenhues (1):
12456 Fix typos in the documentation
12458 Robin H. Johnson (1):
12459 t9001: Fix test prerequisites
12462 Version v1.7.4-rc0; changes since v1.7.3.5:
12463 -------------------------------------------
12466 status: show branchname with a configurable color
12468 Alexander Sulfrian (2):
12469 daemon: add helper function named_sock_setup
12470 daemon: allow more than one host address given via --listen
12472 Alexandre Erwin Ittner (1):
12473 gitk: Add Brazilian Portuguese (pt-BR) translation
12475 Anders Kaseorg (4):
12476 describe: Use for_each_rawref
12477 describe: Do not use a flex array in struct commit_name
12478 describe: Store commit_names in a hash table by commit SHA1
12479 describe: Delay looking up commits until searching for an inexact match
12481 Antonio Ospite (1):
12482 git-send-email.perl: make initial In-Reply-To apply only to first email
12485 diffcore-pickaxe.c: a void function shouldn't try to return something
12486 Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
12487 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
12489 Brian Gernhardt (1):
12490 t6022: Use -eq not = to test output of wc -l
12492 Christopher Wilson (1):
12493 Enable highlight executable path as a configuration option
12495 Clemens Buchacher (6):
12496 t7607: use test-lib functions and check MERGE_HEAD
12497 t7607: add leading-path tests
12498 add function check_ok_to_remove()
12499 lstat_cache: optionally return match_len
12500 do not overwrite files in leading path
12501 use persistent memory for rejected paths
12504 mergetool-lib: combine vimdiff and gvimdiff run blocks
12505 mergetool-lib: add a three-way diff view for vim/gvim
12506 mergetool-lib: make the three-way diff the default for vim/gvim
12509 fast-import: Allow filemodify to set the root
12510 fast-import: insert new object entries at start of hash bucket
12511 fast-import: let importers retrieve blobs
12513 Elijah Newren (53):
12514 Document pre-condition for tree_entry_interesting
12515 tree-walk: Correct bitrotted comment about tree_entry()
12516 tree_entry_interesting(): Make return value more specific
12517 diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
12518 t3509: Add rename + D/F conflict testcase that recursive strategy fails
12519 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
12520 t6032: Add a test checking for excessive output from merge
12521 t6022: Add test combinations of {content conflict?, D/F conflict remains?}
12522 t6022: Add tests for reversing order of merges when D/F conflicts present
12523 t6022: Add tests with both rename source & dest involved in D/F conflicts
12524 t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
12525 t6022: Add tests for rename/rename combined with D/F conflicts
12526 t6020: Modernize style a bit
12527 t6020: Add a testcase for modify/delete + directory/file conflict
12528 t6036: Test index and worktree state, not just that merge fails
12529 t6036: Add a second testcase similar to the first but with content changes
12530 t6036: Add testcase for undetected conflict
12531 merge-recursive: Small code clarification -- variable name and comments
12532 merge-recursive: Rename conflict_rename_rename*() for clarity
12533 merge-recursive: Nuke rename/directory conflict detection
12534 merge-recursive: Move rename/delete handling into dedicated function
12535 merge-recursive: Move delete/modify handling into dedicated function
12536 merge-recursive: Move process_entry's content merging into a function
12537 merge-recursive: New data structures for deferring of D/F conflicts
12538 merge-recursive: New function to assist resolving renames in-core only
12539 merge-recursive: Have process_entry() skip D/F or rename entries
12540 merge-recursive: Structure process_df_entry() to handle more cases
12541 merge-recursive: Update conflict_rename_rename_1to2() call signature
12542 merge-recursive: Update merge_content() call signature
12543 merge-recursive: Avoid doubly merging rename/add conflict contents
12544 merge-recursive: Move handling of double rename of one file to two
12545 merge-recursive: Move handling of double rename of one file to other file
12546 merge-recursive: Delay handling of rename/delete conflicts
12547 merge-recursive: Delay content merging for renames
12548 merge-recursive: Delay modify/delete conflicts if D/F conflict present
12549 conflict_rename_delete(): Check whether D/F conflicts are still present
12550 conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
12551 merge_content(): Check whether D/F conflicts are still present
12552 handle_delete_modify(): Check whether D/F conflicts are still present
12553 merge-recursive: Make room for directories in D/F conflicts
12554 merge-recursive: Remove redundant path clearing for D/F conflicts
12555 t4017 (diff-retval): replace manual exit code check with test_expect_code
12556 t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
12557 t4002 (diff-basic): use test_might_fail for commands that might fail
12558 t4202 (log): Replace '<git-command> || :' with test_might_fail
12559 t4019 (diff-wserror): add lots of missing &&
12560 t4026 (color): remove unneeded and unchained command
12561 t5602 (clone-remote-exec): add missing &&
12562 t6016 (rev-list-graph-simplify-history): add missing &&
12563 t7001 (mv): add missing &&
12564 t7601 (merge-pull-config): add missing &&
12565 t7800 (difftool): add missing &&
12566 Introduce sane_unset and use it to ensure proper && chaining
12569 Side-step sed line-ending "corruption" leading to t6038 failure.
12570 Side-step MSYS-specific path "corruption" leading to t5560 failure.
12571 Fix 'clone' failure at DOS root directory.
12572 Fix Windows-specific macro redefinition warning.
12573 Add MinGW-specific execv() override.
12575 Erik Faye-Lund (20):
12576 mingw: do not crash on open(NULL, ...)
12577 inet_ntop: fix a couple of old-style decls
12578 mingw: use real pid
12579 mingw: support waitpid with pid > 0 and WNOHANG
12580 mingw: add kill emulation
12581 daemon: use run-command api for async serving
12582 daemon: use full buffered mode for stderr
12583 daemon: get remote host address from root-process
12584 mingw: import poll-emulation from gnulib
12585 mingw: use poll-emulation from gnulib
12586 daemon: use socklen_t
12587 daemon: make --inetd and --detach incompatible
12588 daemon: opt-out on features that require posix
12589 msvc: opendir: fix malloc-failure
12590 msvc: opendir: allocate enough memory
12591 msvc: opendir: do not start the search
12592 win32: dirent: handle errors
12593 msvc: opendir: handle paths ending with a slash
12594 win32: use our own dirent.h
12595 help: always suggest common-cmds if prefix of cmd
12597 Giuseppe Bilotta (15):
12598 gitweb: use fullname as hash_base in heads link
12599 gitweb: introduce remote_heads feature
12600 gitweb: git_get_heads_list accepts an optional list of refs
12601 gitweb: separate heads and remotes lists
12602 gitweb: nagivation menu for tags, heads and remotes
12603 gitweb: allow action specialization in page header
12604 gitweb: remotes view for a single remote
12605 gitweb: refactor repository URL printing
12606 gitweb: provide a routine to display (sub)sections
12607 gitweb: group remote heads by remote
12608 git instaweb: enable remote_heads
12609 web--browse: coding style
12610 web--browse: split valid_tool list
12611 web--browse: support opera, seamonkey and elinks
12612 web--browse: better support for chromium
12615 Allow creation of arbitrary git-shell commands
12616 Add interactive mode to git-shell for user-friendliness
12617 Add sample commands for git-shell
12618 shell: Display errors from improperly-formatted command lines
12620 Ilari Liusvaara (4):
12621 Add bidirectional_transfer_loop()
12624 remote-fd/ext: finishing touches after code review
12626 Jakub Narębski (12):
12627 t/gitweb-lib.sh: Use GIT_BUILD_DIR
12628 t/gitweb-lib.sh: Use tabs for indent consistently
12629 gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
12630 t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
12631 gitweb/Makefile: Add 'test' and 'test-installed' targets
12632 gitweb/Makefile: Include gitweb/config.mak
12633 gitweb: Fix test of highlighting support in t9500
12634 gitweb: Fix bug in evaluate_path_info
12635 gitweb: Improve behavior for actionless path_info gitweb URLs
12636 gitweb: Time::HiRes is in core for Perl 5.8
12637 gitweb: selectable configurations that change with each request
12638 gitweb: Fix handling of whitespace in generated links
12641 read-tree: deprecate syntax without tree-ish args
12644 tests: factor out terminal handling from t7006
12645 tests: test terminal output to both stdout and stderr
12646 push: pass --progress down to git-pack-objects
12647 config: treat non-existent config files as empty
12648 diff: report bogus input to -C/-M/-B
12649 docs: clarify git diff modes of operation
12650 allow command-specific pagers in pager.<cmd>
12651 docs: default to more modern toolset
12652 default color.status.branch to "same as header"
12653 tests: add some script lint checks
12654 tests: flip executable bit on t9158
12655 handle arbitrary ints in git_config_maybe_bool
12656 t2107: mark passing test as success
12659 clone: Add the --recurse-submodules option as alias for --recursive
12660 fetch/pull: Add the --recurse-submodules option
12661 Add the 'fetch.recurseSubmodules' config setting
12662 Submodules: Add the "fetchRecurseSubmodules" config option
12663 git submodule: Remove now obsolete tests before cloning a repo
12666 git-send-email.perl: Add --to-cmd
12668 Johan Herland (23):
12669 notes.c: Hexify SHA1 in die() message from init_notes()
12670 (trivial) notes.h: Minor documentation fixes to copy_notes()
12671 notes.h: Make default_notes_ref() available in notes API
12672 notes.c: Reorder functions in preparation for next commit
12673 notes.h/c: Allow combine_notes functions to remove notes
12674 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
12675 (trivial) t3303: Indent with tabs instead of spaces for consistency
12676 notes.c: Use two newlines (instead of one) when concatenating notes
12677 builtin/notes.c: Split notes ref DWIMmery into a separate function
12678 git notes merge: Initial implementation handling trivial merges only
12679 builtin/notes.c: Refactor creation of notes commits.
12680 git notes merge: Handle real, non-conflicting notes merges
12681 git notes merge: Add automatic conflict resolvers (ours, theirs, union)
12682 Documentation: Preliminary docs on 'git notes merge'
12683 git notes merge: Manual conflict resolution, part 1/2
12684 git notes merge: Manual conflict resolution, part 2/2
12685 git notes merge: List conflicting notes in notes merge commit message
12686 git notes merge: --commit should fail if underlying notes ref has moved
12687 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
12688 git notes merge: Add testcases for merging notes trees at different fanouts
12689 Provide 'git notes get-ref' to easily retrieve current notes ref
12690 cmd_merge(): Parse options before checking MERGE_HEAD
12691 Provide 'git merge --abort' as a synonym to 'git reset --merge'
12693 Johannes Schindelin (1):
12694 merge-octopus: Work around environment issue on Windows
12697 t7300: add a missing SYMLINKS prerequisite
12698 apply --whitespace=fix: fix tab-in-indent
12699 Make the tab width used for whitespace checks configurable
12700 Avoid duplicate test number t7609
12702 Jonathan Nieder (52):
12703 merge-recursive: expose merge options for builtin merge
12704 ll-merge: replace flag argument with options struct
12705 commit-tree: free commit message before exiting
12706 test-lib: allow test code to check the list of declared prerequisites
12707 test_terminal: catch use without TTY prerequisite
12708 test_terminal: ensure redirections work reliably
12709 fast-import: filemodify after M 040000 <tree> "" crashes
12710 fast-import: tighten M 040000 syntax
12711 t9300 (fast-import): another test for the "replace root" feature
12712 fast-import: do not clear notes in do_change_note_fanout()
12713 user-manual: remote-tracking can be checked out, with detached HEAD
12714 tests: add missing &&
12715 tests: add missing &&, batch 2
12716 test-lib: introduce test_line_count to measure files
12717 t6022 (renaming merge): chain test commands with &&
12718 t1502 (rev-parse --parseopt): test exit code from "-h"
12719 t1400 (update-ref): use test_must_fail
12720 t3301 (notes): use test_expect_code for clarity
12721 t3404 (rebase -i): unroll test_commit loops
12722 t3404 (rebase -i): move comment to description
12723 t3404 (rebase -i): introduce helper to check position of HEAD
12724 t4124 (apply --whitespace): use test_might_fail
12725 wrapper: move xmmap() to sha1_file.c
12726 wrapper: move odb_* to environment.c
12727 path helpers: move git_mkstemp* to wrapper.c
12728 strbuf: move strbuf_branchname to sha1_name.c
12729 wrapper: give zlib wrappers their own translation unit
12730 pack-objects: mark file-local variable static
12731 Remove pack file handling dependency from wrapper.o
12732 Describe various forms of "be quiet" using OPT__QUIET
12733 fast-import: treat SIGUSR1 as a request to access objects early
12734 git-rev-parse.txt: clarify --git-dir
12735 gitweb: document $per_request_config better
12736 fast-import: stricter parsing of integer options
12737 fast-import: clarify documentation of "feature" command
12738 fast-import: Allow cat-blob requests at arbitrary points in stream
12739 git submodule -b ... of current HEAD fails
12740 Makefile: dependencies for vcs-svn tests
12741 parse-options: clearer reporting of API misuse
12742 parse-options: move NODASH sanity checks to parse_options_check
12743 parse-options: sanity check PARSE_OPT_NOARG flag
12744 parse-options: never suppress arghelp if LITERAL_ARGHELP is set
12745 parse-options: allow git commands to invent new option types
12746 parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
12747 update-index: migrate to parse-options API
12748 treap: make treap_insert return inserted node
12749 vcs-svn: fix intermittent repo_tree corruption
12750 Makefile: transport-helper uses thread-utils.h
12751 t9300: avoid short reads from dd
12752 bash: simple reimplementation of _get_comp_words_by_ref
12753 t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
12754 t0001: test git init when run via an alias
12757 Add string comparison functions that respect the ignore_case variable.
12758 Case insensitivity support for .gitignore via core.ignorecase
12759 Add case insensitivity support for directories when using git status
12760 Add case insensitivity support when using git ls-files
12761 Support case folding for git add when core.ignorecase=true
12762 Support case folding in git fast-import when core.ignorecase=true
12764 Junio C Hamano (31):
12765 gitdiffcore doc: update pickaxe description
12766 diff: pass the entire diff-options to diffcore_pickaxe()
12767 git log/diff: add -G<regexp> that greps in the patch text
12768 diff/log -G<pattern>: tests
12769 grep: move logic to compile header pattern into a separate helper
12770 log --author: take union of multiple "author" requests
12771 disallow branch names that start with a hyphen
12773 merge-recursive: Restructure showing how to chain more process_* functions
12774 Martin Langhoff has a new e-mail address
12775 Make test script t9157 executable
12776 merge-recursive:make_room_for_directories - work around dumb compilers
12777 core.abbrevguard: Ensure short object names stay unique a bit longer
12778 read_sha1_file(): report correct name of packfile with a corrupt object
12779 A loose object is not corrupt if it cannot be read due to EMFILE
12780 t9001: send-email interation with --in-reply-to and --chain-reply-to
12781 t3404: do not use 'describe' to implement test_cmp_rev
12782 Update draft release notes to 1.7.4
12783 Update draft release notes to 1.7.4
12784 t9300: remove unnecessary use of /dev/stdin
12785 t9119: do not compare "Text Last Updated" line from "svn info"
12786 t9010 fails when no svn is available
12787 get_sha1: teach ":$n:<path>" the same relative path logic
12788 Documentation/git.txt: update list of maintenance releases
12789 fetch_populated_submodules(): document dynamic allocation
12790 thread-utils.h: simplify the inclusion
12791 Relnotes: remove items fixed on 'maint'
12792 get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
12793 Update draft release notes to 1.7.4
12794 set_try_to_free_routine(NULL) means "do nothing special"
12797 Justin Frankel (2):
12798 merge-recursive --patience
12799 merge-recursive: options to ignore whitespace changes
12802 merge-recursive: option to specify rename threshold
12803 diff: add synonyms for -M, -C, -B
12804 completion: Support the DWIM mode for git checkout
12805 blame: Add option to show author email instead of name
12806 submodule: preserve all arguments exactly when recursing
12807 submodule: only preserve flags across recursive status/update invocations
12808 rebase: better rearranging of fixup!/squash! lines with --autosquash
12809 rebase: teach --autosquash to match on sha1 in addition to message
12810 diff: add --detect-copies-harder as a synonym for --find-copies-harder
12812 Kirill Smelkov (1):
12813 gitk: Show notes by default (like git log does)
12816 completion: make compatible with zsh
12817 completion: fix zsh check under bash with 'set -u'
12820 add support for the SUA layer (interix; windows)
12821 Interix: add configure checks
12823 Martin Storsjö (1):
12824 Improve the mingw getaddrinfo stub to handle more use cases
12826 Martin von Zweigbergk (3):
12827 rebase: support --verify
12828 Use reflog in 'pull --rebase . foo'
12829 completion: add missing configuration variables
12832 Better "Changed but not updated" message in git-status
12833 Replace "remote tracking" with "remote-tracking"
12834 Change remote tracking to remote-tracking in non-trivial places
12835 everyday.txt: change "tracking branch" to "remote-tracking branch"
12836 Change "tracking branch" to "remote-tracking branch"
12837 Change incorrect uses of "remote branch" meaning "remote-tracking"
12838 Change incorrect "remote branch" to "remote tracking branch" in C code
12839 user-manual.txt: explain better the remote(-tracking) branch terms
12840 git-branch.txt: mention --set-upstream as a way to change upstream configuration
12842 Michael J Gruber (4):
12844 test: allow running the tests under "prove"
12845 t800?-blame.sh: retitle uniquely
12846 t1020-subdirectory: test alias expansion in a subdirectory
12849 mingw: add network-wrappers for daemon
12850 mingw: implement syslog
12851 compat: add inet_pton and inet_ntop prototypes
12853 Nguyễn Thái Ngọc Duy (64):
12854 branch -h: show usage even in an invalid repository
12855 checkout-index -h: show usage even in an invalid repository
12856 commit/status -h: show usage even with broken configuration
12857 gc -h: show usage even with broken configuration
12858 ls-files -h: show usage even with corrupt index
12859 merge -h: show usage even with corrupt index
12860 update-index -h: show usage even with corrupt index
12861 add: do not rely on dtype being NULL behavior
12862 get_cwd_relative(): do not misinterpret root path
12863 builtins: print setup info if repo is found
12864 Add t1510 and basic rules that run repo setup
12865 t1510: setup case #0
12866 t1510: setup case #1
12867 t1510: setup case #2
12868 t1510: setup case #3
12869 t1510: setup case #4
12870 t1510: setup case #5
12871 t1510: setup case #6
12872 t1510: setup case #7
12873 t1510: setup case #8
12874 t1510: setup case #9
12875 t1510: setup case #10
12876 t1510: setup case #11
12877 t1510: setup case #12
12878 t1510: setup case #13
12879 t1510: setup case #14
12880 t1510: setup case #15
12881 t1510: setup case #16
12882 t1510: setup case #17
12883 t1510: setup case #18
12884 t1510: setup case #19
12885 t1510: setup case #20
12886 t1510: setup case #21
12887 t1510: setup case #22
12888 t1510: setup case #23
12889 t1510: setup case #24
12890 t1510: setup case #25
12891 t1510: setup case #26
12892 t1510: setup case #27
12893 t1510: setup case #28
12894 t1510: setup case #29
12895 t1510: setup case #30
12896 t1510: setup case #31
12897 cache.h: realign and use (1 << x) form for CE_* constants
12898 dir.c: add free_excludes()
12899 unpack-trees: move all skip-worktree checks back to unpack_trees()
12900 unpack-trees: fix sparse checkout's "unable to match directories"
12901 Revert "excluded_1(): support exclude files in index"
12902 setup: save prefix (original cwd relative to toplevel) in startup_info
12903 Make prefix_path() return char* without const
12904 get_sha1: support relative path ":path" syntax
12905 get_sha1_oneline: make callers prepare the commit list to traverse
12906 get_sha1: support $commit^{/regex} syntax
12907 get_sha1: handle special case $commit^{/}
12908 Add git_config_early()
12909 Use git_config_early() instead of git_config() during repo setup
12910 setup: limit get_git_work_tree()'s to explicit setup case only
12911 setup: clean up setup_bare_git_dir()
12912 setup: clean up setup_discovered_git_dir()
12913 setup: rework setup_explicit_git_dir()
12914 Remove all logic from get_git_work_tree()
12915 Revert "Documentation: always respect core.worktree if set"
12916 git.txt: correct where --work-tree path is relative to
12917 setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
12920 Minor indentation fix.
12921 Remove @smtp_host_parts variable as not used.
12922 New send-email option smtpserveroption.
12925 commit: helper methods to reduce redundant blocks of code
12926 pretty.c: teach format_commit_message() to reencode the output
12927 commit: --fixup option for use with rebase --autosquash
12928 add tests of commit --fixup
12929 commit: --squash option for use with rebase --autosquash
12930 add tests of commit --squash
12933 MinGW: fix stat() and lstat() implementations for handling symlinks
12934 MinGW: Report errors when failing to launch the html browser.
12935 Skip t1300.70 and 71 on msysGit.
12936 Do not strip CR when grepping HTTP headers.
12937 Skip 'git archive --remote' test on msysGit
12938 git-am: fix detection of absolute paths for windows
12939 git-gui: show command-line errors in a messagebox on Windows
12940 git-gui: enable the Tk console when tracing/debugging on Windows
12941 git-gui: generic version trimming
12942 git-gui: use full dialog width for old name when renaming branch
12943 git-gui: correct assignment of work-tree
12944 git-gui: use wordprocessor tab style to ensure tabs work as expected
12945 git-gui: apply color information from git diff output
12947 Peter Krefting (1):
12948 gitk: Update Swedish translation (290t)
12950 Peter van der Does (1):
12951 bash: get --pretty=m<tab> completion to work with bash v4
12954 Add global and system-wide gitattributes
12957 commit.c: Remove backward goto in read_craft_line()
12959 Ramkumar Ramachandra (10):
12960 shell: Rewrite documentation and improve error message
12961 t4014-format-patch: Call test_tick before committing
12962 format-patch: Don't go over merge commits
12963 fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
12964 merge: Make '--log' an integer option for number of shortlog entries
12965 merge: Make 'merge.log' an integer or boolean option
12966 t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
12967 t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
12968 Porcelain scripts: Rewrite cryptic "needs update" error message
12969 t9010 (svn-fe): Eliminate dependency on svn perl bindings
12971 Ramsay Allan Jones (10):
12972 msvc: Fix compilation errors in compat/win32/sys/poll.c
12973 msvc: git-daemon.exe: Fix linker "unresolved externals" error
12974 msvc: Fix build by adding missing INTMAX_MAX define
12975 msvc: Fix macro redefinition warnings
12976 t3600-rm.sh: Don't pass a non-existent prereq to test #15
12977 t9142: Move call to start_httpd into the setup test
12978 lib-git-svn.sh: Avoid setting web server variables unnecessarily
12979 lib-git-svn.sh: Add check for mis-configured web server variables
12980 t9501-*.sh: Fix a test failure on Cygwin
12981 difftool: Fix failure on Cygwin
12984 add description parameter to OPT__VERBOSE
12985 add description parameter to OPT__DRY_RUN
12986 add description parameter to OPT__QUIET
12988 archive: improve --verbose description
12989 branch: improve --verbose description
12990 verify-tag: document --verbose
12993 bisect: improve error message of 'bisect log' while not bisecting
12994 bisect: improve error msg of 'bisect reset' when original HEAD is deleted
12995 bisect: check for mandatory argument of 'bisect replay'
12996 bash: offer refs for 'git bisect start'
12997 bash: not all 'git bisect' subcommands make sense when not bisecting
12998 bash: support more 'git notes' subcommands and their options
12999 bash: support pretty format aliases
13002 parse-remote: handle detached HEAD
13005 t3030: Add a testcase for resolvable rename/add conflict with symlinks
13007 Sebastian Schuberth (3):
13008 MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility
13009 MinGW: Add missing file mode bit defines
13010 On Windows, avoid git-gui to call Cygwin's nice utility
13012 Shawn O. Pearce (2):
13013 Use git_open_noatime when accessing pack data
13014 Work around EMFILE when there are too many pack files
13017 gitk: Prevent the text pane from becoming editable
13018 gitk: Make text selectable on Mac
13021 send-email: Use To: headers in patch files
13022 send-email: Don't leak To: headers between patches
13023 parse-options: Don't call parse_options_check() so much
13024 parse-options: do not infer PARSE_OPT_NOARG from option type
13027 git-svn: allow the mergeinfo property to be set
13029 Sven Eckelmann (1):
13030 contrib/ciabot: git-describe commit instead of HEAD
13033 t5523-push-upstream: add function to ensure fresh upstream repo
13034 t5523-push-upstream: test progress messages
13035 format-patch: page output with --stdout
13036 bash completion: add basic support for git-reflog
13039 commit: Add commit_list prefix in two function names.
13040 builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
13041 builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
13044 {cvs,svn}import: use the new 'git read-tree --empty'
13045 t0003: properly quote $HOME
13046 gitk: Add the equivalent of diff --color-words
13048 Torsten Bögershausen (1):
13049 t9143: do not fail when unhandled.log.gz is not created
13052 diff: use "find" instead of "detect" as prefix for long forms of -M and -C
13054 Ævar Arnfjörð Bjarmason (22):
13055 send-email: use catfile() to concatenate files
13056 send-email: use lexical filehandle for opendir
13057 send-email: use lexical filehandles for $compose
13058 send-email: use lexical filehandles during sending
13059 send-email: get_patch_subject doesn't need a prototype
13060 send-email: file_declares_8bit_cte doesn't need a prototype
13061 send-email: unique_email_list doesn't need a prototype
13062 send-email: cleanup_compose_files doesn't need a prototype
13063 send-email: use \E***\Q instead of \*\*\*
13064 send-email: sanitize_address use $foo, not "$foo"
13065 send-email: sanitize_address use qq["foo"], not "\"foo\""
13066 send-email: use (?:) instead of () if no match variables are needed
13067 send-email: send_message die on $!, not $?
13068 send-email: make_message_id use "require" instead of "use"
13069 send-email: use Perl idioms in while loop
13070 send-email: is_rfc2047_quoted use qr// regexes
13071 send-email: extract_valid_address use qr// regexes
13072 Makefile & configure: add a NO_FNMATCH flag
13073 Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
13074 test-lib: make test_expect_code a test command
13075 t7004-tag.sh: re-arrange git tag comment for clarity
13076 tests: use test_cmp instead of piping to diff(1)
13079 CodingGuidelines: Add a section on writing documentation
13080 diff,difftool: Don't use the {0,2} notation in usage strings
13083 Version v1.7.3.5; changes since v1.7.3.4:
13084 -----------------------------------------
13087 test-lib.sh/test_decode_color(): use octal not hex in awk script
13089 Jakub Narębski (1):
13090 gitweb: Include links to feeds in HTML header only for '200 OK' response
13093 ident: die on bogus date format
13096 Fix typo in git-gc document.
13098 Jonathan Nieder (2):
13099 t0050: fix printf format strings for portability
13100 gitweb: skip logo in atom feed when there is none
13102 Junio C Hamano (5):
13103 commit: die before asking to edit the log message
13104 am --abort: keep unrelated commits since the last failure and warn
13105 rebase --skip: correctly wrap-up when skipping the last patch
13106 Prepare for 1.7.3.5
13110 status: Quote paths with spaces in short format
13112 Kirill Smelkov (2):
13113 t/t8006: Demonstrate blame is broken when cachetextconv is on
13114 fill_textconv(): Don't get/put cache if sha1 is not valid
13117 fsck docs: remove outdated and useless diagnostic
13119 Michael J Gruber (2):
13120 git-difftool.txt: correct the description of $BASE and describe $MERGED
13121 difftool: provide basename to external tools
13123 Ramsay Allan Jones (1):
13124 t3419-*.sh: Fix arithmetic expansion syntax error
13127 close file on error in read_mmfile()
13129 Robin H. Johnson (2):
13130 Fix false positives in t3404 due to SHELL=/bin/false
13131 t9001: Fix test prerequisites
13134 userdiff: fix typo in ruby and python word regexes
13136 Vasyl' Vavrychuk (1):
13137 trace.c: mark file-local function static
13140 Version v1.7.3.4; changes since v1.7.3.3:
13141 -----------------------------------------
13144 contrib/hooks/post-receive-email: fix return values from prep_for_email
13146 Alejandro R. Sedeño (1):
13147 Add --force to git-send-email documentation
13149 Anders Kaseorg (1):
13150 apply: Recognize epoch timestamps with : in the timezone
13152 Christoph Mallon (1):
13153 diff --check: correct line numbers of new blank lines at EOF
13155 Clemens Buchacher (6):
13156 t7607: use test-lib functions and check MERGE_HEAD
13157 t7607: add leading-path tests
13158 add function check_ok_to_remove()
13159 lstat_cache: optionally return match_len
13160 do not overwrite files in leading path
13161 use persistent memory for rejected paths
13163 Federico Cuello (1):
13164 Fix git-apply with -p greater than 1
13166 Gabriel Corona (2):
13167 t5550: test HTTP authentication and userinfo decoding
13168 Fix username and password extraction from HTTP URLs
13170 Jakub Narębski (1):
13171 gitweb: Introduce esc_attr to escape attributes of HTML elements
13174 git-pull.txt: Mention branch.autosetuprebase
13177 log.decorate: accept 0/1 bool values
13178 reflogs: clear flags properly in corner case
13180 Jonathan "Duke" Leto (1):
13181 Correct help blurb in checkout -p and friends
13183 Jonathan Nieder (4):
13184 apply: handle patches with funny filename and colon in timezone
13185 cherry-pick/revert: transparently refresh index
13186 Documentation: split gitignore page into sections
13187 Documentation: point to related commands from gitignore
13189 Junio C Hamano (5):
13190 test: git-apply -p2 rename/chmod only
13191 Do not link with -lcrypto under NO_OPENSSL
13192 Prepare for 1.7.3.4
13193 Prepare for 1.7.3.4
13196 Kirill Smelkov (1):
13197 setup: make sure git_dir path is in a permanent buffer, getenv(3) case
13199 Martin von Zweigbergk (2):
13200 rebase --abort: do not update branch ref
13201 rebase: only show stat if configured to true
13203 Michael J Gruber (6):
13204 t/t7004-tag: test handling of rfc1991 signatures
13205 verify-tag: factor out signature detection
13206 tag: factor out sig detection for body edits
13207 tag: factor out sig detection for tag display
13208 tag: recognize rfc1991 signatures
13209 git-rm.txt: Fix quoting
13211 Nguyễn Thái Ngọc Duy (1):
13212 entry.c: remove "checkout-index" from error messages
13215 diff: don't presume empty file when corresponding object is missing
13216 make pack-objects a bit more resilient to repo corruption
13218 Tay Ray Chuan (10):
13219 smart-http: Don't change POST to GET when following redirect
13220 t5550-http-fetch: add missing '&&'
13221 t5550-http-fetch: add test for http-fetch
13222 shift end_url_with_slash() from http.[ch] to url.[ch]
13223 url: add str wrapper for end_url_with_slash()
13224 http-backend: use end_url_with_slash()
13225 http-push: Normalise directory names when pushing to some WebDAV servers
13226 http-push: check path length before using it
13227 http-push: add trailing slash at arg-parse time, instead of later on
13228 http-fetch: rework url handling
13230 Ævar Arnfjörð Bjarmason (2):
13231 perl: bump the required Perl version to 5.8 from 5.6.[21]
13232 perl: use "use warnings" instead of -w
13235 Version v1.7.3.3; changes since v1.7.3.2:
13236 -----------------------------------------
13238 Andreas Köhler (1):
13239 submodule sync: Update "submodule.<name>.url" for empty directories
13242 Fix handling of git-p4 on deleted files
13245 userdiff.c: add builtin fortran regex patterns
13246 builtin/revert.c: don't dereference a NULL pointer
13248 Brian Gernhardt (1):
13249 t/gitweb-lib: Don't pass constant to decode_utf8
13251 Clemens Buchacher (3):
13252 add rebase patch id tests
13253 do not search functions for patch ID
13254 do not overwrite untracked during merge from unborn branch
13257 git-blame.el: Add (require 'format-spec)
13259 Diego Elio Pettenò (1):
13260 imap-send: link against libcrypto for HMAC and others
13262 Erik Faye-Lund (1):
13263 mingw: do not set errno to 0 on success
13265 Giuseppe Bilotta (1):
13266 CodingGuidelines: mention whitespace preferences for shell scripts
13269 repack: add -F flag to let user choose between --no-reuse-delta/object
13270 Documentation: pack.compression: explain how to recompress
13273 git-commit.txt: (synopsis): move -i and -o before "--"
13276 diff: don't use pathname-based diff drivers for symlinks
13277 rev-list: handle %x00 NUL in user format
13278 docs: give more hints about how "add -e" works
13279 apply: don't segfault on binary files with missing data
13280 docs: give more hints about how "add -e" works
13281 document sigchain api
13284 pull: Remove --tags option from manpage
13287 mailmap: fix use of freed memory
13290 git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
13292 Jonathan Nieder (5):
13293 t4203 (mailmap): stop hardcoding commit ids and dates
13294 send-pack: avoid redundant "pack-objects died with strange error"
13295 Documentation: document show -s
13296 add: introduce add.ignoreerrors synonym for add.ignore-errors
13297 Documentation: do not misinterpret pull refspec as bold text
13299 Junio C Hamano (5):
13300 t4203: do not let "git shortlog" DWIM based on tty
13301 t3402: test "rebase -s<strategy> -X<opt>"
13302 Documentation: Fix mark-up of lines with more than one tilde
13307 test-lib: extend test_decode_color to handle more color codes
13308 diff: handle lines containing only whitespace and tabs better
13310 Kevin P. Fleming (1):
13311 post-receive-email: ensure sent messages are not empty
13313 Kirill Smelkov (3):
13314 blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
13315 blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
13316 blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
13318 Martin von Zweigbergk (2):
13319 rebase -X: do not clobber strategy
13320 Documentation/git-pull: clarify configuration
13322 Michael J Gruber (6):
13323 git-reset.txt: clarify branch vs. branch head
13324 git-reset.txt: reset does not change files in target
13325 git-reset.txt: reset --soft is not a no-op
13326 git-reset.txt: use "working tree" consistently
13327 git-reset.txt: point to git-checkout
13328 git-reset.txt: make modes description more consistent
13330 Nathan W. Panike (1):
13331 Fix a formatting error in git-merge.txt
13333 Nguyễn Thái Ngọc Duy (3):
13334 dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout
13335 clean: avoid quoting twice
13336 clean: remove redundant variable baselen
13339 diff: avoid repeated scanning while looking for funcname
13342 send-email: Refuse to send cover-letter template subject
13343 prefix_filename(): safely handle the case where pfx_len=0
13344 merge-file: correctly find files when called in subdir
13345 repack: place temporary packs under .git/objects/pack/
13347 Uwe Kleine-König (1):
13348 get_author_ident_from_commit(): remove useless quoting
13351 Fix copy-pasted comments related to tree diff handling.
13352 Keep together options controlling the behaviour of diffcore-rename.
13353 Document that rev-list --graph triggers parent rewriting.
13356 bash: Match lightweight tags in prompt
13358 Ævar Arnfjörð Bjarmason (1):
13359 Makefile: add CC to TRACK_CFLAGS
13362 Version v1.7.3.2; changes since v1.7.3.1:
13363 -----------------------------------------
13365 Andreas Gruenbacher (1):
13366 Clarify and extend the "git diff" format documentation
13368 Antonio Ospite (1):
13369 t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
13372 Documentation: update-index: -z applies also to --index-info
13375 diffcore-pickaxe.c: remove unnecessary curly braces
13378 documentation: git-config minor cleanups
13381 t3020 (ls-files-error-unmatch): remove stray '1' from end of file
13384 Documentation/git-svn: discourage "noMetadata"
13386 Erik Faye-Lund (1):
13387 do not depend on signed integer overflow
13389 Johannes Schindelin (2):
13390 Make sure that git_getpass() never returns NULL
13391 Fix typo in pack-objects' usage
13394 stash: simplify parsing fixes
13396 Jonathan Nieder (10):
13397 t0004 (unwritable files): simplify error handling
13398 environment.c: remove unused variable
13399 setup: make sure git dir path is in a permanent buffer
13400 init: plug tiny one-time memory leak
13401 xdiff: cast arguments for ctype functions to unsigned char
13402 Documentation: No argument of ALLOC_GROW should have side-effects
13403 Documentation: gitrevisions is in section 7
13404 Documentation: diff can compare blobs
13405 Documentation: expand 'git diff' SEE ALSO section
13406 Documentation: update implicit "--no-index" behavior in "git diff"
13408 Junio C Hamano (4):
13409 MinGW: avoid collisions between "tags" and "TAGS"
13410 CodingGuidelines: reword parameter expansion section
13411 shell portability: no "export VAR=VAL"
13415 Update test script annotate-tests.sh to handle missing/extra authors
13417 Kirill Smelkov (1):
13418 user-manual: be consistent in illustrations to 'git rebase'
13420 Mathias Lafeldt (1):
13421 git-svn: fix processing of decorated commit hashes
13424 diff: trivial fix for --output file error message
13426 Michael J Gruber (4):
13427 remote-helpers: build in platform independent directory
13428 user-manual: fix anchor name Finding-comments-With-given-Content
13429 rev-list-options: clarify --parents and --children
13430 git-show-ref.txt: clarify the pattern matching
13432 Ramkumar Ramachandra (1):
13433 SubmittingPatches: Document some extra tags used in commit messages
13436 work around buggy S_ISxxx(m) implementations
13439 git-svn: check_cherry_pick should exclude commits already in our history
13442 Better advice on using topic branches for kernel development
13444 Uwe Kleine-König (1):
13445 Documentation/git-clone: describe --mirror more verbosely
13448 t/t3415: use && where applicable.
13451 Use angles for placeholders consistently
13452 Fix odd markup in --diff-filter documentation
13453 Use parentheses and `...' where appropriate
13454 Remove stray quotes in --pretty and --format documentation
13455 Put a space between `<' and argument in pack-objects usage string
13456 Fix {update,checkout}-index usage strings
13459 Version v1.7.3.1; changes since v1.7.3:
13460 ---------------------------------------
13463 t/t3903-stash: improve testing of git-stash show
13464 wt-status.c: don't leak directory entries when processing untracked,ignored
13465 git-send-email.perl: ensure $domain is defined before using it
13467 Brian Gernhardt (1):
13468 git-stash: fix flag parsing
13470 Christian Couder (1):
13471 t6050 (replace): fix bogus "fetch branch with replacement" test
13473 Daniel Knittl-Frank (1):
13474 Improvements to `git checkout -h`
13477 prefer test -h over test -L in shell scripts
13480 stash: fix git stash branch regression when branch creation fails
13482 Junio C Hamano (2):
13483 CodingGuidelines: spell Arithmetic Expansion with $(($var))
13486 Linus Torvalds (1):
13487 Fix missing 'does' in man-page for 'git checkout'
13490 update comment and documentation for :/foo syntax
13492 Michael J Gruber (1):
13493 contrib/completion: --no-index option to git diff
13496 strbuf.h: fix comment typo
13497 dir.c: squelch false uninitialized memory warning
13499 Ramsay Allan Jones (1):
13500 t1503: Fix arithmetic expansion syntax error when using dash
13502 Tomas Carnecky (1):
13503 stash drops the stash even if creating the branch fails because it already exists
13505 Wesley J. Landaker (1):
13506 Documentation: Refer to git-commit-tree in git-filter-branch help
13509 Version v1.7.3; changes since v1.7.3-rc2:
13510 -----------------------------------------
13513 t/t7300: workaround ancient touch by rearranging arguments
13515 Brian Gernhardt (1):
13516 t7003: Use test_commit instead of custom function
13519 git-rebase--interactive.sh: replace cut with ${v%% *}
13522 git-ls-files.txt: clarify -x/--exclude option
13524 Junio C Hamano (2):
13525 ls-files documentation: reword for consistency
13529 Version v1.7.3-rc2; changes since v1.7.3-rc1:
13530 ---------------------------------------------
13533 bundle: detect if bundle file cannot be created
13534 filter-branch: retire --remap-to-ancestor
13537 Several tests: cd inside subshell instead of around
13538 t1020: Get rid of 'cd "$HERE"' at the start of each test
13540 Jonathan Nieder (5):
13541 tests: subshell indentation stylefix
13542 t1450 (fsck): remove dangling objects
13543 t2105 (gitfile): add missing &&
13544 t1302 (core.repositoryversion): style tweaks
13545 t2016 (checkout -p): add missing &&
13547 Junio C Hamano (3):
13548 t3101: modernise style
13549 ls-tree $di $dir: do not mistakenly recurse into directories
13553 git-gui: use shell to launch textconv filter in "blame"
13556 Add --src/dst-prefix to git-formt-patch in git-rebase.sh
13559 git-gui: Make usage statement visible on Windows.
13560 git-gui: display error launching blame as a message box.
13561 git-gui: handle textconv filter on Windows and in development
13562 git-gui: ensure correct application termination in git-gui--askpass
13563 git-gui: avoid mis-encoding the copyright message on Windows.
13566 Peter Krefting (1):
13567 git-gui: Update Swedish translation (521t).
13569 Ramsay Allan Jones (1):
13570 vcs-svn: Fix some printf format compiler warnings
13573 compat/nedmalloc: don't force NDEBUG on the rest of git
13576 RE: [PATCH] Avoid rename/add conflict when contents are identical
13579 Version v1.7.3-rc1; changes since v1.7.3-rc0:
13580 ---------------------------------------------
13583 Add a new option 'core.askpass'.
13585 Brandon Casey (10):
13586 t/t5510: demonstrate failure to fetch when current branch has merge ref
13587 builtin/fetch.c: ignore merge config when not fetching from branch's remote
13588 t/t7008: workaround broken handling of \000 by printf on IRIX
13589 Makefile: use compat regex on IRIX 6.5
13590 builtin/fetch.c: comment that branch->remote_name is usable when has_merge
13591 t/t5510-fetch.sh: improve testing with explicit URL and merge spec
13592 diff.c: call regfree to free memory allocated by regcomp when necessary
13593 xdiff-interface.c: always trim trailing space from xfuncname matches
13594 t/t4018: test whether the word_regex patterns compile
13595 t/t4018: avoid two unnecessary sub-shell invocations
13598 cache_tree_free: Fix small memory leak
13599 revert: Fix trivial comment style issue
13602 pass "git -c foo=bar" params through environment
13603 tests: make test_must_fail more verbose
13604 tests: make test_must_fail fail on missing commands
13607 t3404 & t7508: cd inside subshell instead of around
13610 notes: Don't create (empty) commit when removing non-existing notes
13613 fast-export: ensure that a renamed file is printed after all references
13615 Jonathan Nieder (3):
13616 do not pass "git -c foo=bar" params to transport helpers
13617 tests: make test_might_fail more verbose
13618 tests: make test_might_fail fail on missing commands
13620 Junio C Hamano (3):
13621 install-webdoc: keep installed RelNotes-*.txt
13622 Prepare for 1.7.3 rc1
13626 Allow core.askpass to override SSH_ASKPASS.
13627 Extend documentation of core.askpass and GIT_ASKPASS.
13630 config.txt: fix placement of diff.noprefix
13633 Documentation: move RelNotes into a directory of their own
13636 builtin.h: Move two functions definitions to help.h.
13637 builtin/clean.c: Use STRING_LIST_INIT_NODUP.
13640 Version v1.7.3-rc0; changes since v1.7.2.5:
13641 -------------------------------------------
13643 Alejandro R. Sedeño (1):
13644 gitweb: move highlight config out of guess_file_syntax()
13647 Add a for_each_string_list_item macro
13648 Convert the users of for_each_string_list to for_each_string_list_item macro
13650 Alexander Gladysh (1):
13651 Add a rename + D/F conflict testcase
13653 Anders Kaseorg (1):
13654 gitweb: Don't die_error in git_tag after already printing headers
13657 git-rebase--interactive.sh: rework skip_unnecessary_picks
13658 git-rebase--interactive.sh: use printf instead of echo to print commit message
13660 Brian Gernhardt (2):
13661 t7610: cd inside subshell instead of around
13662 t7606: Avoid using head as a file name
13664 Charles Bailey (1):
13665 mergetool: Remove explicit references to /dev/tty
13667 Christian Couder (11):
13668 revert: report success when using option --strategy
13669 revert: refactor commit code into a new run_git_commit() function
13670 revert: don't print "Finished one cherry-pick." if commit failed
13671 revert: improve success message by adding abbreviated commit sha1
13672 t3508: add check_head_differs_from() helper function and use it
13673 revert: fix off by one read when searching the end of a commit subject
13674 revert: refactor code to find commit subject in find_commit_subject()
13675 revert: rename variables related to subject in get_message()
13676 bisect: use find_commit_subject() instead of custom code
13677 merge-recursive: use find_commit_subject() instead of custom code
13678 blame: use find_commit_subject() instead of custom code
13680 Clemens Buchacher (1):
13681 hash binary sha1 into patch id
13684 mergetool: Skip autoresolved paths
13687 Add memory pool library
13688 Add string-specific memory pool
13689 Add stream helper library
13690 Infrastructure to write revisions in fast-export format
13693 David D. Kilzer (3):
13694 git svn: fix dcommit to work with touched files
13695 git-svn: fix regex to remove "tail" from svn tags
13696 git-svn: fix fetch with deleted tag
13698 Diane Gasselin (2):
13699 merge-recursive: porcelain messages for checkout
13700 t7609: test merge and checkout error messages
13702 Dmitry Statyvka (1):
13703 git svn: add an option to recode pathnames
13705 Elijah Newren (13):
13706 Add additional testcases for D/F conflicts
13707 merge-recursive: Fix D/F conflicts
13708 merge_recursive: Fix renames across paths below D/F conflicts
13709 fast-export: Fix output order of D/F changes
13710 fast-import: Improve robustness when D->F changes provided in wrong order
13711 fast-export: Fix dropping of files with --import-marks and path limiting
13712 fast-export: Add a --full-tree option
13713 upload-pack: Improve error message when bad ref requested
13714 Mark tests that use symlinks as needing SYMLINKS prerequisite
13715 merge-recursive: Fix typo
13716 t6031: Add a testcase covering multiple renames across a D/F conflict
13717 merge-recursive: Fix multiple file rename across D/F conflict
13718 merge-recursive: Avoid excessive output for and reprocessing of renames
13721 instaweb: fix WEBrick server support
13722 instaweb: minimize moving parts for WEBrick
13723 instaweb: add access+error logging for WEBrick
13724 t9155: fix compatibility with older SVN
13726 Eyvind Bernhardsen (3):
13727 Avoid conflicts when merging branches with mixed normalization
13728 Try normalizing files to avoid delete/modify conflicts when merging
13729 Don't expand CRLFs when normalizing text during merge
13732 Change regerror() declaration from K&R style to ANSI C (C89)
13735 split_cmdline: Allow caller to access error string
13738 Teach ref iteration module about submodules
13739 setup_revisions(): Allow walking history in a submodule
13740 Implement automatic fast-forward merge for submodules
13741 add configuration variable for --autosquash option of interactive rebase
13743 Jakub Narębski (1):
13744 gitweb: Fix typo in run() subroutine
13747 Convert "! git" to "test_must_fail git"
13748 Add -e/--exclude to git-clean.
13749 Add test for git clean -e.
13750 builtin/push.c: remove useless temporary variable
13751 Document git-instaweb start/stop/restart
13754 Add treap implementation
13757 docs: fix Makefile dependency for user manual
13760 Submodules: Add the new "ignore" config option for diff and status
13761 Submodules: Use "ignore" settings from .gitmodules too for diff and status
13762 Add tests for the diff.ignoreSubmodules config option
13763 checkout: Add test for diff.ignoreSubmodules
13764 checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
13765 t7405: cd inside subshell instead of around
13766 t7406 & t7407: add missing && at end of lines
13769 Make graph_next_line() available in the graph.h API
13770 Enable custom schemes for column colors in the graph API
13772 Johannes Schindelin (2):
13773 Add the 'diff.ignoreSubmodules' config setting
13774 checkout: respect diff.ignoreSubmodules setting
13777 Fix compat/regex ANSIfication on MinGW
13780 detached-stash: introduce parse_flags_and_revs function
13781 detached-stash: work around git rev-parse failure to detect bad log refs
13782 detached-stash: simplify stash_apply
13783 detached-stash: simplify stash_drop
13784 detached-stash: refactor git stash pop implementation
13785 detached-stash: simplify git stash branch
13786 detached-stash: simplify git stash show
13787 detached-stash: tests of git stash with stash-like arguments
13788 detached-stash: update Documentation
13789 rev-parse: exit with non-zero status if ref@{n} is not valid.
13790 sha1_name.c: use warning in preference to fprintf(stderr
13791 rev-parse: tests git rev-parse --verify master@{n}, for various n
13792 t1503: fix broken test_must_fail calls
13793 t3903: fix broken test_must_fail calls
13795 Jonathan Nieder (89):
13796 Teach fast-import to import subtrees named by tree id
13797 Export parse_date_basic() to convert a date string to timestamp
13798 t1501 (rev-parse): clarify
13799 tests: try git apply from subdir of toplevel
13800 setup: split off $GIT_DIR-set case from setup_git_directory_gently
13801 setup: split off a function to checks working dir for .git file
13802 setup: split off code to handle stumbling upon a repository
13803 setup: split off a function to handle hitting ceiling in repo search
13804 setup: split off get_device_or_die helper
13805 t1011 (sparse checkout): style nitpicks
13806 gitweb: allow configurations that change with each request
13807 t4111 (apply): refresh index before applying patches to it
13808 diff: split off a function for --stat-* option parsing
13809 t6038 (merge.renormalize): style nitpicks
13810 t6038 (merge.renormalize): try checkout -m and cherry-pick
13811 t6038 (merge.renormalize): check that it can be turned off
13812 merge-trees: push choice to renormalize away from low level
13813 merge-trees: let caller decide whether to renormalize
13814 Documentation/technical: document ll_merge
13815 ll-merge: make flag easier to populate
13816 ll-merge: let caller decide whether to renormalize
13817 t4200 (rerere): modernize style
13818 rerere: migrate to parse-options API
13819 rerere: never renormalize
13820 merge-recursive --renormalize
13821 Introduce vcs-svn lib
13822 Update svn-fe manual
13823 svn-fe manual: Clarify warning about deltas in dump files
13824 vcs-svn: remove build artifacts on "make clean"
13826 compat: add strtok_r()
13827 vcs-svn: Rename dirent pool to build on Windows
13828 vcs-svn: Avoid %z in format string
13829 t9010 (svn-fe): use Unix-style path in URI
13830 t9010 (svn-fe): avoid symlinks in test
13831 Eliminate “Finished cherry-pick/revert” message
13832 Introduce advise() to print hints
13833 cherry-pick/revert: Use error() for failure message
13834 cherry-pick/revert: Use advise() for hints
13835 t7606 (merge-theirs): modernize style
13836 merge: let custom strategies intervene in trivial merges
13837 t7006 (pager): add missing TTY prerequisites
13838 merge: do not mistake (ancestor of) tag for branch
13839 t7600 (merge): modernize style
13840 t7600 (merge): do not launch gitk for --debug
13841 t7600 (merge): check reflog entry
13842 t7600 (merge): test merge from branch yet to be born
13843 t6010 (merge-base): modernize style
13844 t6200 (fmt-merge-msg): style nitpicks
13845 Documentation: add a SEE ALSO section for merge-base
13846 merge-base --octopus to mimic show-branch --merge-base
13847 merge-base --independent to print reduced parent list in a merge
13848 fmt-merge-msg -m to override merge title
13849 merge script: --squash, --ff from unborn branch are errors
13850 merge script: tweak unmerged files message to match builtin
13851 merge script: refuse to merge during merge
13852 merge script: improve log message subject
13853 merge script: merge -X<option>
13854 merge script: allow custom strategies
13855 merge script: forbid merge -s index
13856 merge script: handle -m --log correctly
13857 merge script: handle many-way octopus
13858 merge script: --ff-only to disallow true merge
13859 merge script: handle --no-ff --no-commit correctly
13860 merge script: notice @{-1} shorthand
13861 merge script: learn --[no-]rerere-autoupdate
13862 autoconf: don't use platform regex if it lacks REG_STARTEND
13863 Documentation: set a !DOCTYPE for user manual
13864 Documentation: tweak description of log.date
13865 Documentation: quoting trouble in "git rm" discussion
13866 Documentation: unbreak regex in show-ref manual
13867 Documentation: clarify quoting in "git add" example
13868 Documentation: add missing quotes to "git grep" examples
13869 Documentation: clarify quoting in "git rm" example
13870 Documentation: clarify quoting in gitignore docs
13871 Documentation: remove backslashes in manpage synopses
13872 Documentation/technical: avoid stray backslash in parse-options API docs
13873 Documentation: remove stray backslash from "git bundle" manual
13874 Documentation: remove backslash before ~ in fast-import manual
13875 Documentation: remove stray backslashes in rev-parse manual
13876 Documentation: avoid stray backslashes in core tutorial
13877 Documentation: avoid stray backslash in user manual
13878 Documentation: do not convert ... operator to ellipses
13879 Documentation: remove stray backslashes from "Fighting regressions" article
13880 Documentation: remove stray backslash in show-branch discussion
13881 apply: split quoted filename handling into new function
13882 tests: exercise "git apply" with weird filenames
13883 apply: handle traditional patches with space in filename
13884 tests: simplify "missing PREREQ" message
13886 Junio C Hamano (6):
13887 cvs tests: do not touch test CVS repositories shipped with source
13888 compat/regex: get rid of old-style definition
13889 autoconf: regex library detection typofix
13890 Work around em-dash handling in newer AsciiDoc
13891 install-webdoc: filter timestamp-only changes correctly
13894 Kevin P. Fleming (1):
13895 post-receive-email: optional message line count limit
13898 diff: parse separate options like -S foo
13899 diff: parse separate options --stat-width n, --stat-name-width n
13900 log: parse separate options like git log --grep foo
13901 log: parse separate option for --glob
13902 rebase -i: add exec command to launch a shell command
13903 test-lib: user-friendly alternatives to test [-d|-f|-e]
13904 Turn unpack_trees_options.msgs into an array + enum
13905 merge-recursive: distinguish "removed" and "overwritten" messages
13906 unpack_trees: group error messages by type
13907 tests: factor HOME=$(pwd) in test-lib.sh
13908 Move set_porcelain_error_msgs to unpack-trees.c and rename it
13909 setup_unpack_trees_porcelain: take the whole options struct as parameter
13910 Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
13911 t7609-merge-co-error-msgs: test non-fast forward case too.
13913 Michael J Gruber (3):
13914 git-bundle.txt: Cleanup
13915 git-bundle.txt: whitespace cleanup
13916 git-bundle.txt: Clarify rev-list-args restrictions
13919 rebase: support -X to pass through strategy options
13921 Nguyễn Thái Ngọc Duy (22):
13922 upload-pack: remove unused "create_full_pack" code in do_rev_list
13923 setup: do not forget working dir from subdir of gitdir
13924 Revert "rehabilitate 'git index-pack' inside the object store"
13925 setup: split off a function to handle ordinary .git directories
13926 unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
13927 unpack-trees: let read-tree -u remove index entries outside sparse area
13928 unpack-trees: do not check for conflict entries too early
13929 unpack-trees: mark new entries skip-worktree appropriately
13930 git wrapper: introduce startup_info struct
13931 setup: remember whether repository was found
13932 git wrapper: allow setup_git_directory_gently() be called earlier
13933 shortlog: run setup_git_directory_gently() sooner
13934 grep: run setup_git_directory_gently() sooner
13935 apply: run setup_git_directory_gently() sooner
13936 bundle: run setup_git_directory_gently() sooner
13937 config: run setup_git_directory_gently() sooner
13938 index-pack: run setup_git_directory_gently() sooner
13939 ls-remote: run setup_git_directory_gently() sooner
13940 var: run setup_git_directory_gently() sooner
13941 merge-file: run setup_git_directory_gently() sooner
13942 clone: warn users --depth is ignored in local clones
13943 parse_object: pass on the original sha1, not the replaced one
13946 Userdiff patterns for C#
13948 Ralf Wildenhues (1):
13949 Typos in code comments, an error message, documentation
13951 Ramkumar Ramachandra (1):
13952 builtin/checkout: Fix message when switching to an existing branch
13954 Spencer E. Olson (1):
13955 Allow HTTP user agent string to be modified.
13958 git svn: URL-decode left-hand side of svn refspec
13960 Sverre Rabbelier (1):
13961 config: add --local option
13964 add tests for checkout -b
13965 builtin/checkout: reword hint for -b
13966 builtin/checkout: learn -B
13967 builtin/checkout: handle -B from detached HEAD correctly
13970 string_list: Add STRING_LIST_INIT macro and make use of it.
13971 object.h: Add OBJECT_ARRAY_INIT macro and make use of it.
13974 Do not unquote + into ' ' in URLs
13975 ls-files: learn a debugging dump format
13976 Makefile: make gcov invocation configurable
13977 test: Introduce $GIT_BUILD_DIR
13979 Ævar Arnfjörð Bjarmason (59):
13980 sha1_file: Show the the type and path to corrupt objects
13981 tests: Ignore the Test::Harness .prove file
13982 t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
13983 SubmittingPatches: Clarify the Signed-off-by rules
13984 SubmittingPatches: Cite the 50 char subject limit
13985 perl/Makefile: Unset INSTALL_BASE when making perl.mak
13986 test-lib: Don't write test-results when HARNESS_ACTIVE
13987 test-lib: Add support for multiple test prerequisites
13988 test-lib: Print missing prerequisites in test output
13989 t/README: Document the predefined test prerequisites
13990 tests: A SANITY test prereq for testing if we're root
13991 test-lib: Multi-prereq support only checked the last prereq
13992 tests: Infrastructure for Git smoke testing
13993 t/README: Document the Smoke testing
13994 t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
13995 t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
13996 gitignore: Ignore files generated by "make coverage"
13997 Makefile: Include subdirectories in "make cover" reports
13998 Makefile: Split out the untested functions target
13999 Makefile: Add cover_db target
14000 Makefile: Add cover_db_html target
14001 t/README: A new section about test coverage
14002 t/README: Add a note about the dangers of coverage chasing
14003 tests: implicitly skip SYMLINKS tests using <prereq>
14004 t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
14005 t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
14006 t/t7800-difftool.sh: Skip with prereq on no PERL
14007 t/README: Update "Skipping tests" to align with best practices
14008 t/t1304-default-acl: change from skip_all=* to prereq skip
14009 t/t5705-clone-2gb: change from skip_all=* to prereq skip
14010 t/t7005-editor: change from skip_all=* to prereq skip
14011 t/t5503-tagfollow: change from skip_all=* to prereq skip
14012 t/t4016-diff-quote: change from skip_all=* to prereq skip
14013 t/t3902-quoted: change from skip_all=* to prereq skip
14014 t/t3300-funny-names: change from skip_all=* to prereq skip
14015 git-notes: Run partial expensive test everywhere
14016 t/Makefile: Create test-results dir for smoke target
14017 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
14018 t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
14019 lib-patch-mode tests: change from skip_all=* to prereq skip
14020 t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
14021 t/t9001-send-email.sh: Remove needless PROG=* assignment
14022 t/t9001-send-email.sh: change from skip_all=* to prereq skip
14023 t/t9001-send-email.sh: convert setup code to tests
14024 t/t7105-reset-patch.sh: Add a PERL prerequisite
14025 t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
14026 t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
14027 tests: fix syntax error in "Use advise() for hints" test
14028 compat/regex: use the regex engine from gawk for compat
14029 compat/regex: get the gawk regex engine to compile within git
14030 compat/regex: define out variables only used under RE_ENABLE_I18N
14031 t/t9010-svn-fe.sh: add an +x bit to this test
14032 t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
14033 reset: suggest what to do upon "git reset --mixed <paths>"
14034 test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
14035 test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
14036 test-lib: Allow overriding of TEST_DIRECTORY
14037 t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
14038 test-lib: use subshell instead of cd $new && .. && cd $old
14041 Version v1.7.2.5; changes since v1.7.2.4:
14042 -----------------------------------------
14044 Jakub Narębski (1):
14045 gitweb: Introduce esc_attr to escape attributes of HTML elements
14047 Junio C Hamano (1):
14051 Version v1.7.2.4; changes since v1.7.2.3:
14052 -----------------------------------------
14055 diff.c: call regfree to free memory allocated by regcomp when necessary
14056 xdiff-interface.c: always trim trailing space from xfuncname matches
14059 cache_tree_free: Fix small memory leak
14060 revert: Fix trivial comment style issue
14063 Fix whitespace issue in object.c
14066 git-commit.txt: (synopsis): move -i and -o before "--"
14069 t5505: add missing &&
14071 Jonathan Nieder (1):
14072 add: introduce add.ignoreerrors synonym for add.ignore-errors
14074 Junio C Hamano (3):
14075 tag.c: whitespace breakages fix
14076 t3101: modernise style
14080 config.txt: fix placement of diff.noprefix
14083 compat/nedmalloc: don't force NDEBUG on the rest of git
14086 bash: Match lightweight tags in prompt
14089 Version v1.7.2.3; changes since v1.7.2.2:
14090 -----------------------------------------
14093 Makefile: link builtins residing in bin directory to main git binary too
14094 Makefile: make hard/symbolic links for non-builtins too
14097 fetch: allow command line --tags to override config
14100 submodule sync: Update "submodule.<name>.url"
14103 t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
14104 pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
14105 tree-walk: Correct bitrotted comment about tree_entry()
14108 pack-refs: remove newly empty directories
14111 for-each-ref: fix objectname:short bug
14114 t7403: add missing &&'s
14116 Jonathan Nieder (12):
14117 t4150 (am): style fix
14118 t4150 (am): futureproof against failing tests
14119 t3400 (rebase): whitespace cleanup
14120 archive: abbreviate substituted commit ids again
14121 checkout, commit: remove confusing assignments to rev.abbrev
14122 examples/commit: use --abbrev for commit summary
14123 Documentation: flesh out “git pull” description
14124 core: Stop leaking ondisk_cache_entrys
14125 read-tree: stop leaking tree objects
14126 write-tree: Avoid leak when index refers to an invalid object
14127 t3302 (notes): Port to Solaris
14128 parse-options: clarify PARSE_OPT_NOARG description
14130 Junio C Hamano (6):
14131 Teach "apply --index-info" to handle rename patches
14132 rebase: protect against diff.renames configuration
14133 diff --follow: do not waste cycles while recursing
14134 diff --follow: do call diffcore_std() as necessary
14135 Prepare for 1.7.2.3
14138 Linus Torvalds (1):
14139 Fix 'git log' early pager startup error case
14142 Tell ignore file about generate files in /gitweb/static
14145 xmalloc: include size in the failure message
14146 t0003: add missing && at end of lines
14149 fix >4GiB source delta assertion failure
14151 Ralf Wildenhues (1):
14152 Typos in code comments, an error message, documentation
14155 mingw_utime(): handle NULL times parameter
14156 rerere: fix overeager gc
14159 builtin/merge_recursive.c: Add an usage string and make use of it.
14162 Documentation/git-reset: reorder modes for soft-mixed-hard progression
14163 Documentation/reset: separate options by mode
14164 Documentation/reset: promote 'examples' one section up
14165 Documentation/reset: reorder examples to match description
14166 Documentation/reset: move "undo permanently" example behind "make topic"
14169 Documentation: spelling fixes
14171 Ævar Arnfjörð Bjarmason (1):
14172 log: test for regression introduced in v1.7.2-rc0~103^2~2
14175 Version v1.7.2.2; changes since v1.7.2.1:
14176 -----------------------------------------
14179 Documentation: cite git-am from git-apply
14182 t/t7003: replace \t with literal tab in sed expression
14184 Clément Poulain (1):
14185 git-gui: use textconv filter for diff and blame
14187 David D. Kilzer (1):
14188 Fix git rebase --continue to work with touched files
14191 git-gui: check whether systems nice command works or disable it
14192 git-gui: fix usage of themed widgets variable
14193 git-gui: fix usage of _gitworktree when creating shortcut for windows
14194 git-gui: fix PATH environment for mingw development environment
14195 git-gui: fix shortcut creation on cygwin
14197 Jakub Narębski (1):
14198 diff: strip extra "/" when stripping prefix
14200 Jonathan Nieder (7):
14201 check-ref-format: handle subcommands in separate functions
14202 Allow "check-ref-format --branch" from subdirectory
14203 Makefile: add missing dependencies on url.h
14204 Makefile: add missing dependency on http.h
14205 Documentation: add a FILES section for show-ref
14206 gitweb: clarify search results page when no matching commit found
14207 Standardize do { ... } while (0) style
14209 Junio C Hamano (4):
14210 Fix DIFF_QUEUE_CLEAR refactoring
14211 Documentation: reporting bugs
14212 sha1_name.c: fix parsing of ":/token" syntax
14215 Markus Heidelberg (1):
14216 git-gui: fix "Explore Working Copy" for Windows again
14219 Document ls-files -t as semi-obsolete.
14220 pretty-options.txt: match --format's documentation with implementation.
14221 Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
14222 post-receive-email: remove spurious commas in email subject
14223 push: mention "git pull" in error message for non-fast forwards
14225 Michael J Gruber (1):
14226 Documentation/git-log: Clarify --full-diff
14229 index-pack: Don't follow replace refs.
14232 git-gui: Handle failure of core.worktree to identify the working directory.
14233 git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
14234 git-gui: mc cannot be used before msgcat has been loaded
14235 git-gui: fix size and position of window panes on startup
14237 Raja R Harinath (1):
14238 fast-import: export correctly marks larger than 2^20-1
14240 Ramkumar Ramachandra (2):
14241 contrib/svn-fe: Fix IncludePath
14242 contrib/svn-fe: Add the svn-fe target to .gitignore
14245 notes: allow --dry-run for -n and --verbose for -v
14246 prune: allow --dry-run for -n and --verbose for -v
14248 Shawn O. Pearce (1):
14249 smart-http: Don't deadlock on server failure
14252 xsize_t: check whether we lose bits
14253 Documentation/rev-parse: quoting is required with --parseopt
14254 t7003: fix subdirectory-filter test
14257 git-rebase: fix typo when parsing --force-rebase
14259 Ævar Arnfjörð Bjarmason (4):
14260 test-lib: Ignore --quiet under a TAP harness
14261 test-lib: Remove 3 year old no-op --no-python option
14262 imap-send: Fix sprintf usage
14263 t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
14266 Version v1.7.2.1; changes since v1.7.2:
14267 ---------------------------------------
14270 git-rebase--interactive.sh: use printf instead of echo to print commit message
14273 git-instaweb: Fix custom apache log placement
14274 git-instaweb: Fix Apache environment variable passing
14275 git-instaweb: Don't assume Apache executable is named apache2
14278 Check size of path buffer before writing into it
14281 t3700-add: fix dependence on stdout and stderr buffering
14284 INSTALL: configure /etc/xml/catalog to build docs on Cygwin
14286 Jonathan Nieder (1):
14287 config --get --path: check for unset $HOME
14289 Junio C Hamano (3):
14295 Clarify help message when no remote is specified in fetch/pull.
14297 Nathan W. Panike (1):
14298 Add a google-chrome option for web--browse
14300 Nguyễn Thái Ngọc Duy (1):
14301 git-read-tree.txt: acknowledge the directory matching bug in sparse checkout
14304 request-pull.txt: Document -p option
14305 commit: remove full stop from usage help for -u
14308 Cast execl*() NULL sentinels to (char *)
14309 Document receive.denyDeleteCurrent
14310 Documentation/git-push: Explain status output in more detail
14311 Fix 'git' wrapper usage string
14312 Makefile: add check-docs exception for gitrevisions
14315 Version v1.7.2; changes since v1.7.2-rc3:
14316 -----------------------------------------
14319 Makefile: remove some unnecessary curly braces
14320 Makefile: work around ksh's failure to handle missing list argument to for loop
14321 t/README: clarify test_must_fail description
14322 t/t3700: convert two uses of negation operator '!' to use test_must_fail
14323 t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail
14324 t/: work around one-shot variable assignment with test_must_fail
14327 Documentation: Explain git-mergetool's use of temporary files
14330 Reorganize `git-log' man page to clarify common diff options.
14333 Check size of path buffer before writing into it
14336 MERGE_RR is in .git, not .git/rr-cache
14339 git add: Add the "--ignore-missing" option for the dry run
14340 git submodule add: Require the new --force option to add ignored paths
14342 Jonathan Nieder (9):
14343 t7006 (pager): introduce helper for parameterized tests
14344 t7006: test pager configuration for several git commands
14345 tests: local config file should be honored from subdirs of toplevel
14346 t3000 (ls-files -o): modernize style
14347 git --paginate: paginate external commands again
14348 gitmodules.5: url can be a relative path
14349 Documentation: add submodule.* to the big configuration variable list
14350 Add a sample user for the svndump library
14351 t/README: correct an exception when breaking a && chain in tests
14353 Junio C Hamano (7):
14354 rebase-i: style fix
14355 rebase-i: do not get fooled by a log message ending with backslash
14356 do not write out index when status does not have to
14357 diff A...B: give one possible diff when there are more than one merge-base
14358 diff A...B: do not limit the syntax too narrowly
14359 tests: correct "does reflog exist?" tests
14362 Michael J Gruber (3):
14363 Documentation: split off rev doc into include file
14364 Documentation: gitrevisions
14365 Documentation: link to gitrevisions rather than git-rev-parse
14368 grep -O: Do not pass color sequences as filenames to pager
14370 Nguyễn Thái Ngọc Duy (1):
14371 git --paginate: do not commit pager choice too early
14373 Nicolas Sebrecht (1):
14374 merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
14376 Pavan Kumar Sunkara (1):
14377 gitweb: fix esc_url
14380 update-server-info: Shorten read_pack_info_file()
14383 git-svn: write memoized data explicitly to avoid Storable bug
14386 Only run aggregate-results over actual counts
14389 add basic tests for merge-tree
14390 merge-tree: fix where two branches share no changes
14392 Ævar Arnfjörð Bjarmason (3):
14393 git submodule: add submodules with git add -f <path>
14394 git submodule add: Remove old docs about implicit -f
14395 git add: Add --ignore-missing to SYNOPSIS
14398 Version v1.7.2-rc3; changes since v1.7.2-rc2:
14399 ---------------------------------------------
14402 diff.c: fix a graph output bug
14404 Fredrik Skolmli (1):
14405 Documentation: Spelling fix in protocol-capabilities.txt
14408 t0005: work around strange $? in ksh when program terminated by a signal
14410 Jonathan Nieder (1):
14411 t9118 (git-svn): prevent early failure from taking down later tests
14413 Junio C Hamano (2):
14414 Fix "read-tree -m A B" priming the cache-tree
14417 Michael J Gruber (3):
14418 t9118: avoid PEG revision identifier in tests
14419 test-lib: simplify GIT_SKIP_TESTS loop
14420 test-lib: TAP compliance for skipping tests on request
14423 format-patch: document the format.to configuration setting
14425 Nicolas Sebrecht (1):
14426 checkout: accord documentation to what git does
14429 git fetch documentation: describe short '-p' synonym to '--prune' option
14431 Raja R Harinath (1):
14432 Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()
14434 Ævar Arnfjörð Bjarmason (1):
14435 tests: Use skip_all=* to skip tests
14438 Version v1.7.2-rc2; changes since v1.7.2-rc1:
14439 ---------------------------------------------
14442 t/t9700/test.pl: don't access private object members, use public access methods
14443 t/t0006: specify timezone as EST5 not EST to comply with POSIX
14446 Documentation/git-gc.txt: add reference to githooks
14449 xdiff: optimise for no whitespace difference when ignoring whitespace.
14452 add missing && to submodule-merge testcase
14454 Jakub Narębski (1):
14455 gitweb: Move evaluate_gitweb_config out of run_request
14458 t0006: test timezone parsing
14459 parse_date: fix signedness in timezone calculation
14460 test-date: fix sscanf type conversion
14462 Jonathan Nieder (1):
14463 t/README: document more test helpers
14465 Junio C Hamano (4):
14466 Updates from the list to 1.7.2 Release Notes
14467 t/README: proposed rewording...
14468 backmerge a few more fixes to 1.7.1.X series
14471 Michael J Gruber (1):
14472 rerere.txt: Document forget subcommand
14474 Pierre Habouzit (1):
14475 fix git branch -m in presence of cross devices
14477 Uwe Kleine-König (1):
14478 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
14480 Ævar Arnfjörð Bjarmason (13):
14481 test-lib: Adjust output to be valid TAP format
14482 test-lib: Make the test_external_* functions TAP-aware
14483 test-lib: output a newline before "ok" under a TAP harness
14484 tests: Skip tests in a way that makes sense under TAP
14485 tests: Say "pass" rather than "ok" on empty lines for TAP
14486 t9700: Use Test::More->builder, not $Test::Builder::Test
14487 t/README: The trash is in 't/trash directory.$name'
14488 t/README: Typo: paralell -> parallel
14489 t/README: Document the prereq functions, and 3-arg test_*
14490 t/README: Document test_external*
14491 t/README: Document test_expect_code
14492 t/README: Add a section about skipping tests
14493 t/README: Document the do's and don'ts of tests
14496 Version v1.7.2-rc1; changes since v1.7.2-rc0:
14497 ---------------------------------------------
14500 bash-completion: Fix __git_ps1 to work with "set -u"
14501 bash completion: Support "divergence from upstream" messages in __git_ps1
14504 t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
14505 t/t7811-grep-open.sh: ensure fake "less" is made executable
14506 t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
14507 t/t9001: use egrep when regular expressions are involved
14509 Brian Gernhardt (1):
14510 t4027,4041: Use test -s to test for an empty file
14512 Christian Couder (1):
14513 revert: accept arbitrary rev-list options
14516 notes: check number of parameters to "git notes copy"
14519 git diff: rename test that had a conflicting name
14520 Add optional parameters to the diff option "--ignore-submodules"
14521 git submodule: ignore dirty submodules for summary and status
14522 Add the option "--ignore-submodules" to "git status"
14524 Johannes Schindelin (3):
14525 Unify code paths of threaded greps
14526 grep: Add the option '--open-files-in-pager'
14527 grep -O: allow optional argument specifying the pager (or editor)
14529 Jonathan Nieder (3):
14530 grep: refactor grep_objects loop into its own function
14531 t3508 (cherry-pick): futureproof against unmerged files
14532 revert: do not rebuild argv on heap
14534 Julian Phillips (6):
14535 string_list: Fix argument order for print_string_list
14536 string_list: Fix argument order for for_each_string_list
14537 string_list: Fix argument order for string_list_insert
14538 string_list: Fix argument order for string_list_insert_at_index
14539 string_list: Fix argument order for string_list_lookup
14540 string_list: Fix argument order for string_list_append
14542 Junio C Hamano (5):
14543 url_decode: URL scheme ends with a colon and does not require a slash
14544 Update draft release notes to 1.7.1.1
14546 git.spec.in: Add gitweb subpackage
14549 Michael J Gruber (4):
14550 t6018: add tests for rev-list's --branches and --tags
14551 t6018: make sure all tested symbolic names are different revs
14552 git-rev-parse.txt: Document ":path" specifier
14553 git-rev-parse.txt: Add more examples for caret and colon
14556 commit.h: add 'type' to struct name_decoration
14557 log-tree.c: Use struct name_decoration's type for classifying decoration
14558 log --decorate: Colorize commit decorations
14559 Allow customizable commit decorations colors
14560 Add test for correct coloring of git log --decoration
14562 Ramsay Allan Jones (2):
14563 msvc: Select the "fast" definition of the {get,put}_be32() macros
14564 notes: Initialise variable to appease gcc
14567 rev-list: introduce --count option
14570 Version v1.7.2-rc0; changes since v1.7.1.4:
14571 -------------------------------------------
14574 Allow passing of configuration parameters in the command line
14575 Use strbufs instead of open-coded string manipulation
14578 textconv: make the API public
14579 textconv: support for blame
14580 t/t8006: test textconv support for blame
14583 Add a macro DIFF_QUEUE_CLEAR.
14584 Make diffcore_std only can run once before a diff_flush
14585 Make git log --follow find copies among unmodified files.
14586 Add a prefix output callback to diff output
14587 Output the graph columns at the end of the commit message
14588 diff.c: Output the text graph padding before each diff line
14589 Emit a whole line in one go
14590 graph.c: register a callback for graph output
14591 Make --color-words work well with --graph
14594 t/t5800: skip if python version is older than 2.5
14595 git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
14596 t/t5150: remove space from sed script
14597 t/t7006: ignore return status of shell's unset builtin
14598 t/aggregate-results: accomodate systems with small max argument list length
14599 Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
14600 Remove python 2.5'isms
14602 Brian Gernhardt (1):
14603 Makefile: Simplify handling of python scripts
14606 whitespace: add tab-in-indent error class
14607 whitespace: tests for git-diff --check with tab-in-indent error class
14608 whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
14609 whitespace: add tab-in-indent support for --whitespace=fix
14610 whitespace: tests for git-apply --whitespace=fix with tab-in-indent
14612 Christian Couder (13):
14613 revert: use strbuf to refactor the code that writes the merge message
14614 revert: refactor merge recursive code into its own function
14615 merge: refactor code that calls "git merge-STRATEGY"
14616 merge: make function try_merge_command non static
14617 revert: add "--strategy" option to choose merge strategy
14618 revert: cleanup code for -x option
14619 revert: use run_command_v_opt() instead of execv_git_cmd()
14620 revert: refactor code into a do_pick_commit() function
14621 revert: change help_msg() to take no argument
14622 revert: allow cherry-picking more than one commit
14623 revert: add tests to check cherry-picking many commits
14624 Documentation/cherry-pick: describe passing more than one commit
14625 Documentation/revert: describe passing more than one commit
14627 Clément Poulain (3):
14628 sha1_name: add get_sha1_with_context()
14629 textconv: support for cat_file
14630 t/t8007: test textconv support for cat-file
14632 Daniel Knittl-Frank (1):
14633 Show branch information in short output of git status
14636 Add `%B' in format strings for raw commit body in `git log' and friends
14639 diff: add configuration option for disabling diff prefixes.
14642 git svn: avoid unnecessary '/' in paths for SVN
14645 git checkout: create unparented branch by --orphan
14646 Documentation: alter checkout --orphan description
14647 refs: split log_ref_write logic into log_ref_setup
14648 checkout --orphan: respect -l option always
14649 t3200: test -l with core.logAllRefUpdates options
14650 bash completion: add --orphan to 'git checkout'
14652 Erik Faye-Lund (1):
14653 mingw: use _commit to implement fsync
14655 Eyvind Bernhardsen (4):
14656 Add tests for per-repository eol normalization
14657 Add per-repository eol normalization
14658 Rename the "crlf" attribute "text"
14659 Add "core.eol" config variable
14661 Finn Arne Gangstad (1):
14662 autocrlf: Make it work also for un-normalized repositories
14664 Gary V. Vaughan (17):
14665 Makefile: pass CPPFLAGS through to fllow customization
14666 Rewrite dynamic structure initializations to runtime assignment
14667 Makefile: -lpthread may still be necessary when libc has only pthread stubs
14668 enums: omit trailing comma for portability
14669 Do not use "diff" found on PATH while building and installing
14670 tests: use "test_cmp", not "diff", when verifying the result
14671 test_cmp: do not use "diff -u" on platforms that lack one
14672 git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
14673 Makefile: some platforms do not have hstrerror anywhere
14674 Make NO_{INET_NTOP,INET_PTON} configured independently
14675 Some platforms lack socklen_t type
14676 Allow disabling "inline"
14677 inline declaration does not work on AIX
14678 Makefile: SunOS 5.6 portability fix
14679 Makefile: HPUX11 portability fixes
14680 Makefile: HP-UX 10.20 portability fixes
14681 Makefile: Tru64 portability fix
14683 Giuseppe Scrivano (1):
14684 print the usage string on stdout instead of stderr
14686 Henrik Grubbström (2):
14687 convert: Safer handling of $Id$ contraction.
14688 convert: Keep foreign $Id$ on checkout.
14690 Jakub Narębski (16):
14691 Export more test-related variables when running external tests
14692 gitweb: href(..., -path_info => 0|1)
14693 gitweb: Use nonlocal jump instead of 'exit' in die_error
14694 gitweb: Add custom error handler using die_error
14695 gitweb: Move generating page title to separate subroutine
14696 gitweb: Silence 'Variable VAR may be unavailable' warnings
14697 gitweb: Improve installation instructions in gitweb/INSTALL
14698 gitweb: Create install target for gitweb in Makefile
14699 gitweb: Refactor syntax highlighting support
14700 gitweb: Put all per-connection code in run() subroutine
14701 git-instaweb: Remove pidfile after stopping web server
14702 git-instaweb: Wait for server to start before running web browser
14703 git-instaweb: Add support for running gitweb via 'plackup'
14704 gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
14705 gitweb: Fix typo in hash key name in %opts in git_header_html
14706 gitweb: Return or exit after done serving request
14709 git-am: suggest what to do with superfluous patches
14712 t5516-fetch-push.sh: style cleanup
14715 make commit_tree a library function
14716 introduce notes-cache interface
14717 textconv: refactor calls to run_textconv
14718 diff: cache textconv output
14719 diff: avoid useless filespec population
14720 script with rev-list instead of log
14721 tests: rename duplicate t4205
14722 tests: chmod +x t5150
14723 make url-related functions reusable
14724 decode file:// and ssh:// URLs
14725 Makefile: default pager on AIX to "more"
14728 diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
14729 Documentation/rev-list-options.txt: Fix missing line in example history graph
14730 Documentation/rev-list-options.txt: Explain --ancestry-path
14731 revision: Fix typo in --ancestry-path error message
14732 revision: Turn off history simplification in --ancestry-path mode
14734 Johannes Schindelin (1):
14735 gitweb: Syntax highlighting support
14737 Johannes Sixt (11):
14738 Modernize t5530-upload-pack-error.
14739 Make report() from usage.c public as vreportf() and use it.
14740 Fix signature of fcntl() compatibility dummy
14741 Windows: more pthreads functions
14742 Reimplement async procedures using pthreads
14743 Dying in an async procedure should only exit the thread, not the process.
14744 Enable threaded async procedures whenever pthreads is available
14745 Have set_try_to_free_routine return the previous routine
14746 Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
14747 Recent MinGW has a C99 implementation of snprintf functions
14748 merge-recursive: demonstrate an incorrect conflict with submodule
14750 Jonathan Nieder (17):
14751 t7400: split setup into multiple tests
14752 t7400: clarify 'submodule add' tests
14753 t7400: clarify submodule update tests
14754 t5800: testgit helper requires Python support
14755 tests for request-pull
14756 request-pull: protect against OPTIONS_KEEPDASHDASH from environment
14757 fsck: check ident lines in commit objects
14758 adapt request-pull tests for new pull request format
14759 pretty: initialize new cmt_fmt_map to 0
14760 Makefile: fix header dependency checker to allow NO_CURL builds
14761 Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
14762 git svn: avoid uninitialized var in 'reset'
14763 Add git remote set-branches
14764 fsck: fix bogus commit header check
14765 rebase: improve error message when upstream argument is missing
14766 DWIM 'git show -5' to 'git show --do-walk -5'
14767 git-svn: strip off leading slashes on --trunk argument
14769 Junio C Hamano (31):
14770 git_config_maybe_bool()
14771 log.decorate: usability fixes
14772 whitespace: we cannot "catch all errors known to git" anymore
14773 GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
14774 Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
14775 log --pretty/--oneline: ignore log.decorate
14776 war on "sleep" in tests
14777 reflog --expire-unreachable: avoid merge-base computation
14778 log.decorate: only ignore it under "log --pretty=raw"
14779 wt-status: remove unused workdir_untracked member
14780 wt-status: plug memory leak while collecting untracked files
14781 wt-status: collect ignored files
14782 wt-status: rename and restructure status-print-untracked
14783 status: --ignored option shows ignored files
14784 Document gc.<pattern>.reflogexpire variables
14785 more war on "sleep" in tests
14786 reflog --expire-unreachable: special case entries in "HEAD" reflog
14787 revision: --ancestry-path
14788 wt-status: fix 'fprintf' compilation warning
14789 t5150: protect backslash with backslash in shell
14791 fixup: do not unconditionally disable "diff -u"
14792 build: propagate $DIFF to scripts
14793 test-lib: use DIFF definition from GIT-BUILD-OPTIONS
14794 Update draft release notes to 1.7.2
14795 Update draft release notes to 1.7.2
14796 Update draft release notes to 1.7.2
14797 Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
14798 Update draft release notes to 1.7.2
14799 url.c: "<scheme>://" part at the beginning should not be URL decoded
14802 Lars R. Damerow (3):
14803 config.c: remove static keyword from git_env_bool()
14804 truncate cwd string before printing error message
14805 Add support for GIT_ONE_FILESYSTEM
14807 Linus Torvalds (1):
14808 Make :/ accept a regex rather than a fixed pattern
14810 Michael J Gruber (5):
14811 for-each-ref: Field with abbreviated objectname
14812 notes: dry-run and verbose options for prune
14813 Documentation+t5708: document and test status -s -b
14814 pretty: Introduce ' ' modifier to add space if non-empty
14815 git-cat-file.txt: Document --textconv
14817 Michael J. Kiwala (1):
14818 git svn: fix empty directory creation
14821 patch-id: extract parsing one diff out of generate_id_list
14822 patch-id: Add support for mbox format
14824 Pavan Kumar Sunkara (6):
14825 gitweb: Use @diff_opts while using format-patch
14826 gitweb: Move static files into seperate subdirectory
14827 gitweb: Set default destination directory for installing gitweb in Makefile
14828 git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
14829 git-instaweb: Configure it to work with new gitweb structure
14830 git-web--browse: Add support for google chrome and chromium
14832 Ramkumar Ramachandra (4):
14833 git am: Set cmdline globally
14834 git am: Display some help text when patch is empty
14835 git am: Remove stray error message from sed
14836 Refactor parse_date for approxidate functions
14839 grep: add test script for binary file handling
14840 grep: grep: refactor handling of binary mode options
14841 grep: --count over binary
14842 grep: --name-only over binary
14843 grep: use memmem() for fixed string search
14844 grep: continue case insensitive fixed string search after NUL chars
14845 grep: use REG_STARTEND for all matching if available
14846 grep: support NUL chars in search strings for -F
14849 gitweb: Add support for FastCGI, using CGI::Fast
14850 git-cvsserver: use a password file cvsserver pserver
14852 Samuel Tardieu (2):
14853 Honor "tagopt = --tags" configuration option
14854 remote add: add a --[no-]tags option
14857 branch: exit status now reflects if branch listing finds an error
14858 branch: don't fail listing branches if one of the commits wasn't found
14861 format-patch: Add a signature option (--signature)
14862 completion: Add --signature and format.signature
14865 Add `log.decorate' configuration variable.
14867 Sverre Rabbelier (7):
14868 clone: pass the remote name to remote_get
14869 clone: also configure url for bare clones
14870 fast-import: always create marks_file directories
14871 remote-helpers: allow requesing the path to the .git directory
14872 remote-helpers: add support for an export command
14873 remote-helpers: add testgit helper
14874 remote-helpers: add tests for testgit helper
14877 ls-remote: fall-back to default remotes when no remote specified
14878 ls-remote: print URL when no repo is specified
14881 diff: add --word-diff option that generalizes --color-words
14882 Complete prototype of git_config_from_parameters()
14883 fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
14884 log_ref_setup: don't return stack-allocated array
14885 parseopt: wrap rev-parse --parseopt usage for eval consumption
14887 Torsten Schmutzler (1):
14888 git-svn: mangle refnames forbidden in git
14891 pretty: make it easier to add new formats
14892 pretty: add infrastructure for commit format aliases
14893 pretty: add aliases for pretty formats
14894 diff-options: make --patch a synonym for -p
14896 Ævar Arnfjörð Bjarmason (12):
14897 Add option to git-commit to allow empty log messages
14898 git-svn documentation: minor grammar fix
14899 git-svn: Remove unused use of File::Temp
14900 git-cvsserver: authentication support for pserver
14901 git-cvsserver: indent & clean up authdb code
14902 git-cvsserver: Improved error handling for pserver
14903 git-cvsserver: document making a password without htpasswd
14904 git-cvsserver: test for pserver authentication support
14905 git-submodule foreach: Add $toplevel variable
14906 Makefile: remove redundant munging of @@INSTLIBDIR@@
14907 git-cvsserver: typo in a comment: bas -> has
14908 git-cvsserver: fix error for invalid password formats
14911 Version v1.7.1.4; changes since v1.7.1.3:
14912 -----------------------------------------
14914 Jakub Narębski (1):
14915 gitweb: Introduce esc_attr to escape attributes of HTML elements
14917 Junio C Hamano (1):
14921 Version v1.7.1.3; changes since v1.7.1.2:
14922 -----------------------------------------
14924 Jonathan Nieder (1):
14925 add: introduce add.ignoreerrors synonym for add.ignore-errors
14927 Junio C Hamano (1):
14931 t0003: add missing && at end of lines
14934 Version v1.7.1.2; changes since v1.7.1.1:
14935 -----------------------------------------
14938 t/README: clarify test_must_fail description
14941 Documentation/git-gc.txt: add reference to githooks
14944 Documentation: Explain git-mergetool's use of temporary files
14947 xdiff: optimise for no whitespace difference when ignoring whitespace.
14949 Fredrik Skolmli (1):
14950 Documentation: Spelling fix in protocol-capabilities.txt
14953 Check size of path buffer before writing into it
14954 Check size of path buffer before writing into it
14957 add missing && to submodule-merge testcase
14960 receive-pack: switch global variable 'commands' to a parameter
14961 receive-pack: detect aliased updates which can occur with symrefs
14964 t0006: test timezone parsing
14965 test-date: fix sscanf type conversion
14968 t0005: work around strange $? in ksh when program terminated by a signal
14970 Jonathan Nieder (3):
14971 gitmodules.5: url can be a relative path
14972 Documentation: add submodule.* to the big configuration variable list
14973 config --get --path: check for unset $HOME
14975 Junio C Hamano (3):
14976 backmerge a few more fixes to 1.7.1.X series
14980 Michael J Gruber (3):
14981 git-rev-parse.txt: Document ":path" specifier
14982 git-rev-parse.txt: Add more examples for caret and colon
14983 rerere.txt: Document forget subcommand
14986 format-patch: document the format.to configuration setting
14988 Nicolas Sebrecht (1):
14989 checkout: accord documentation to what git does
14992 git fetch documentation: describe short '-p' synonym to '--prune' option
14994 Pavan Kumar Sunkara (1):
14995 gitweb: fix esc_url
14997 Pierre Habouzit (1):
14998 fix git branch -m in presence of cross devices
15001 update-server-info: Shorten read_pack_info_file()
15004 request-pull.txt: Document -p option
15007 check_aliased_update: strcpy() instead of strcat() to copy
15009 Uwe Kleine-König (1):
15010 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
15013 Version v1.7.1.1; changes since v1.7.1:
15014 ---------------------------------------
15016 Alexey Mahotkin (1):
15017 xdiff/xmerge.c: use memset() instead of explicit for-loop
15020 diff: fix coloring of extended diff headers
15022 Björn Gustavsson (1):
15023 apply: Allow blank *trailing* context lines to match beyond EOF
15025 Björn Steinbrink (1):
15026 diff: Support visibility modifiers in the PHP hunk header regexp
15029 blame-options.txt: Add default value for `-M/-C` options.
15032 t/t9001: use egrep when regular expressions are involved
15035 unpack-trees: Make index lookahead less pessimal
15037 Brian Gernhardt (4):
15038 send-email: Cleanup { style
15039 send-email: Don't use FQDNs without a '.'
15040 Document send-email --smtp-domain
15041 send-email: Cleanup smtp-domain and add config
15043 Charles Bailey (2):
15044 stash: Don't overwrite files that have gone from the index
15045 stash tests: stash can lose data in a file removed from the index
15048 exec_cmd.c: replace hard-coded path list with one from <paths.h>
15050 Christian Couder (3):
15051 diff: fix "git show -C -C" output when renaming a binary file
15052 commit: use value of GIT_REFLOG_ACTION env variable as reflog message
15053 Documentation: grep: fix asciidoc problem with --
15055 Clemens Buchacher (7):
15056 do not overwrite files marked "assume unchanged"
15057 Documentation: git-add does not update files marked "assume unchanged"
15058 test get_git_work_tree() return value for NULL
15059 get_cwd_relative(): do not misinterpret suffix as subdirectory
15060 setup: document prefix
15061 quote.c: separate quoting and relative path generation
15062 ls-files: allow relative pathspec
15064 Dmitry Potapov (1):
15065 hash_object: correction for zero length file
15067 Gary V. Vaughan (1):
15068 git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
15071 git-submodule.sh: properly initialize shell variables
15073 Henrik Grubbström (3):
15074 attr: Fixed debug output for macro expansion.
15075 attr: Allow multiple changes to an attribute on the same line.
15076 attr: Expand macros immediately when encountered.
15079 Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
15081 Ian Ward Comfort (1):
15082 rebase -i: Abort cleanly if new base cannot be checked out
15084 Jakub Narębski (1):
15085 autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
15088 commit.txt: clarify how --author argument is used
15089 am: use get_author_ident_from_commit instead of mailinfo when rebasing
15090 gitweb/Makefile: fix typo in gitweb.min.css rule
15093 handle "git --bare init <dir>" properly
15094 docs: clarify meaning of -M for git-log
15095 remove over-eager caching in sha1_file_name
15096 pull: do nothing on --dry-run
15097 commit: give advice on empty amend
15098 Makefile: default pager on AIX to "more"
15099 notes: check number of parameters to "git notes copy"
15102 Thread-safe xmalloc and xrealloc needs a recursive mutex
15104 Jonathan Nieder (25):
15105 t7006: guard cleanup with test_expect_success
15106 t5704 (bundle): add tests for bundle --stdin
15107 fix "bundle --stdin" segfault
15108 test-lib: Let tests specify commands to be run at end of test
15109 commit --amend: cope with missing display name
15110 Documentation/shortlog: scripted users should not rely on implicit HEAD
15111 t4201 (shortlog): guard setup with test_expect_success
15112 t4201 (shortlog): Test output format with multiple authors
15113 shortlog: Document and test --format option
15114 test-lib: some shells do not let $? propagate into an eval
15115 cherry-pick: do not dump core when iconv fails
15116 Documentation/notes: document format of notes trees
15117 Documentation/notes: describe content of notes blobs
15118 Documentation/notes: add configuration section
15119 Documentation/notes: simplify treatment of default notes ref
15120 Documentation/log: add a CONFIGURATION section
15121 Documentation/notes: simplify treatment of default display refs
15122 Documentation/notes: clean up description of rewriting configuration
15123 Documentation/notes: nitpicks
15124 post-receive-email: document command-line mode
15125 Documentation/checkout: clarify description
15126 gitignore.5: Clarify matching rules
15127 rebase -i -p: document shortcomings
15128 Documentation/checkout: clarify description
15129 add-interactive: Clarify “remaining hunks in the file”
15131 Junio C Hamano (10):
15132 am -3: recover the diagnostic messages for corrupt patches
15133 clone: quell the progress report from init and report on clone
15134 t9129: fix UTF-8 locale detection
15135 common_prefix: simplify and fix scanning for prefixes
15136 Prepare draft release notes to 1.7.1.1
15137 Update draft release notes to 1.7.1.1
15138 tests: remove unnecessary '^' from 'expr' regular expression
15139 Update draft release notes to 1.7.1.1
15140 Update draft release notes to 1.7.1.1
15143 Leif Arne Storset (1):
15144 Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef
15146 Marcus Comstedt (1):
15147 Add "Z" as an alias for the timezone "UTC"
15149 Markus Heidelberg (4):
15150 t7508: add test for "git status" refreshing the index
15151 git status: refresh the index if possible
15152 t7508: add a test for "git status" in a read-only repository
15153 Documentation: rebase -i ignores options passed to "git am"
15155 Michael J Gruber (10):
15156 index-pack: fix trivial typo in usage string
15157 t7508: test advice.statusHints
15158 wt-status: take advice.statusHints seriously
15159 Documentation: fix minor inconsistency
15160 Documentation/gitdiffcore: fix order in pickaxe description
15161 Documentation/SubmittingPatches: clarify GMail section and SMTP
15162 completion: --set-upstream option for git-branch
15163 Makefile: reenable install with NO_CURL
15164 Documentation/config: describe status.submodulesummary
15165 Documentation: A...B shortcut for checkout and rebase
15168 test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
15171 Documentation/pretty-{formats,options}: better reference for "format:<string>"
15174 Make xmalloc and xrealloc thread-safe
15175 index-pack: smarter memory usage when resolving deltas
15176 index-pack: rationalize unpack_entry_data()
15177 index-pack: smarter memory usage when appending objects
15180 clone: reword messages to match the end-user perception
15182 Peter Collingbourne (4):
15183 Generalise the unlink_or_warn function
15184 Implement the rmdir_or_warn function
15185 Introduce remove_or_warn function
15186 Remove a redundant errno test in a usage of remove_path
15188 Philippe Bruhat (1):
15189 Git.pm: better error message
15192 Documentation/git-send-email: Add "Use gmail as the smtp server"
15194 Ramkumar Ramachandra (1):
15195 SubmittingPatches: Add new section about what to base work on
15197 Ramsay Allan Jones (4):
15198 Makefile: Fix 'clean' target to remove all gitweb build files
15199 msvc: Fix some "expr evaluates to function" compiler warnings
15200 msvc: Fix some compiler warnings
15201 notes: Initialise variable to appease gcc
15204 git diff too slow for a file
15205 remove ecb parameter from xdi_diff_outf()
15206 Fix checkout of large files to network shares on Windows XP
15209 Prompt for a username when an HTTP request 401s
15211 Shawn O. Pearce (16):
15212 tag.c: Correct indentation
15213 tag.h: Remove unused signature field
15214 tag.c: Refactor parse_tag_buffer to be saner to program
15215 tag.c: Parse tagger date (if present)
15216 describe: Break annotated tag ties by tagger date
15217 http.c: Remove bad free of static block
15218 t5550-http-fetch: Use subshell for repository operations
15219 http.c: Tiny refactoring of finish_http_pack_request
15220 http.c: Drop useless != NULL test in finish_http_pack_request
15221 http.c: Don't store destination name in request structures
15222 http.c: Remove unnecessary strdup of sha1_to_hex result
15223 Introduce close_pack_index to permit replacement
15224 Extract verify_pack_index for reuse from verify_pack
15225 Allow parse_pack_index on temporary files
15226 http-fetch: Use index-pack rather than verify-pack to check packs
15227 http-fetch: Use temporary files for pack-*.idx until verified
15229 Sverre Rabbelier (1):
15230 Gitweb: ignore built file
15232 Tay Ray Chuan (18):
15233 t5541-http-push: add test for URLs with trailing slash
15234 http: make end_url_with_slash() public
15235 remote-curl: ensure that URLs have a trailing slash
15236 http.c::new_http_pack_request: do away with the temp variable filename
15237 t7604-merge-custom-message: shift expected output creation
15238 t7604-merge-custom-message: show that --log doesn't append to -m
15239 merge: update comment
15240 merge: rename variable
15241 fmt-merge-msg: minor refactor of fmt_merge_msg()
15242 fmt-merge-msg: refactor merge title formatting
15243 fmt-merge-msg: add function to append shortlog only
15244 merge: --log appends shortlog to message if specified
15245 GIT-VERSION-GEN: restrict tags used
15246 t7502-commit: fix spelling
15247 show-branch: use DEFAULT_ABBREV instead of 7
15248 t7502-commit: add tests for summary output
15249 t7502-commit: add summary output tests for empty and merge commits
15250 commit::print_summary(): don't use format_commit_message()
15253 t/README: document --root option
15254 send-email: ask about and declare 8bit mails
15257 Documentation/SubmittingPatches: Fix typo in GMail section
15260 Change C99 comments to old-style C comments
15263 pretty: Respect --abbrev option
15266 git-mailinfo documentation: clarify -u/--encoding
15269 start_command: close cmd->err descriptor when fork/spawn fails
15271 Ævar Arnfjörð Bjarmason (3):
15272 Move t6000lib.sh to lib-*
15273 Turn setup code in t2007-checkout-symlink.sh into a test
15274 notes: Initialize variable to appease Sun Studio
15277 Version v1.7.1; changes since v1.7.1-rc2:
15278 -----------------------------------------
15281 Documentation improvements for the description of short format.
15284 MSVC: Fix build by adding missing termios.h dummy
15286 Jonathan Nieder (1):
15287 Documentation/Makefile: fix interrupted builds of user-manual.xml
15289 Junio C Hamano (2):
15293 Michael J Gruber (1):
15294 t7012: Mark missing tests as TODO
15297 reflog: remove 'show' from 'expire's usage string
15300 Version v1.7.1-rc2; changes since v1.7.1-rc1:
15301 ---------------------------------------------
15303 Charles Bailey (1):
15304 Documentation: Describe other situations where -z affects git diff
15307 git-instaweb: pass through invoking user's path to gitweb CGI scripts
15310 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
15313 diff: use large integers for diffstat calculations
15314 rebase-interactive: silence warning when no commits rewritten
15317 gitk: Add Ctrl-W shortcut for closing the active window
15318 gitk: Display dirty submodules correctly
15320 Johannes Gilger (1):
15321 pretty: Initialize notes if %N is used
15324 Windows: start_command: Support non-NULL dir in struct child_process
15326 Jonathan Nieder (5):
15327 gitk: Add comments to explain encode_view_opts and decode_view_opts
15328 gitk: Don't clobber "Remember this view" setting
15329 Add .depend directories to .gitignore
15330 Document new "already-merged" rule for branch -d
15331 tag -v: use RUN_GIT_CMD to run verify-tag
15333 Junio C Hamano (6):
15334 SubmittingPatches: update GMail section
15335 blame documentation: -M/-C notice copied lines as well as moved ones
15337 gitweb: simplify gitweb.min.* generation and clean-up rules
15338 t3301: add tests to use --format="%N"
15341 Marc Branchaud (1):
15342 Docs: Add -X option to git-merge's synopsis.
15345 gitk: Remove forced use of sans-serif font
15346 gitk: Set the font for all spinbox widgets
15347 gitk: Set the font for all listbox widgets
15348 gitk: Use consistent font for all text input fields
15350 Matthew Ogilvie (1):
15351 t6006: do not write to /tmp
15353 Michael J Gruber (1):
15354 t1010-mktree: Adjust expected result to code and documentation
15357 gitk: Avoid calling tk_setPalette on Windows
15358 gitk: Add emacs editor variable block
15359 gitk: Fix display of copyright symbol
15361 Ramkumar Ramachandra (5):
15362 Documentation/remote-helpers: Rewrite description
15363 Documentation/urls: Rewrite to accomodate <transport>::<address>
15364 Documentation/remote-helpers: Add invocation section
15365 Fixup: Second argument may be any arbitrary string
15366 Documentation/remote-helpers: Fix typos and improve language
15369 t3507: Make test executable
15372 combined diff: correctly handle truncated file
15375 documentation: clarify direction of core.autocrlf
15378 Version v1.7.1-rc1; changes since v1.7.1-rc0:
15379 ---------------------------------------------
15382 notes.h: declare bit field as unsigned to silence compiler complaints
15385 fix const-correctness of write_sha1_file
15386 fix textconv leak in emit_rewrite_diff
15387 fix typos and grammar in 1.7.1 draft release notes
15388 docs: clarify "branch -l"
15391 Let check_preimage() use memset() to initialize "struct checkout"
15392 Teach diff --submodule and status to handle .git files in submodules
15394 Jonathan Nieder (1):
15395 Teach mailinfo %< as an alternative scissors mark
15397 Junio C Hamano (2):
15398 diff.c: work around pointer constness warnings
15402 Gitweb: add ignore and clean rules for minified files
15403 Gitweb: add support for minifying gitweb.css
15404 Gitweb: add autoconfigure support for minifiers
15405 instaweb: add minification awareness
15406 gitweb: add documentation to INSTALL regarding gitweb.js
15407 gitweb: update INSTALL to use shorter make target
15409 Michael J Gruber (2):
15410 t3301-notes: Test the creation of reflog entries
15411 refs.c: Write reflogs for notes just like for branch heads
15414 branch: say "Reset to" in reflog entries for 'git branch -f' operations
15415 fetch/push: fix usage strings
15418 Version v1.7.1-rc0; changes since v1.7.0.9:
15419 -------------------------------------------
15422 cvsimport: new -R option: generate .git/cvs-revisions mapping
15424 Anders Kaseorg (1):
15425 everyday: fsck and gc are not everyday operations
15428 Make templates honour SHELL_PATH and PERL_PATH
15429 Modernize git calling conventions in hook templates
15431 Benjamin C Meyer (1):
15432 Fix a spelling mistake in a git-p4 console message
15435 make union merge an xdl merge favor
15436 refactor merge flags into xmparam_t
15437 merge-file: add option to specify the marker size
15438 merge-file: add option to select union merge favor
15441 t/t1304: avoid -d option to setfacl
15442 t/t1304: set the Default ACL base entries
15443 t/t1304: use 'test -r' to test readability rather than looking at mode bits
15444 t/t1304: set the ACL effective rights mask
15445 t/t1304: make a second colon optional in the mask ACL check
15446 notes.c: remove inappropriate call to return
15447 t5505: remove unnecessary subshell invocations
15448 t5505: add missing &&
15449 t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
15451 Brian Gernhardt (1):
15452 Use test_expect_success for test setups
15455 imap-send: suppress warning about cleartext password with CRAM-MD5
15457 Christian Couder (8):
15458 reset: add option "--keep" to "git reset"
15459 reset: add test cases for "--keep" option
15460 Documentation: reset: describe new "--keep" option
15461 reset: disallow "reset --keep" outside a work tree
15462 reset: disallow using --keep when there are unmerged entries
15463 cherry-pick: add tests for new --ff option
15464 Documentation: describe new cherry-pick --ff option
15465 rebase -i: use new --ff cherry-pick option
15467 Dave Olszewski (1):
15468 rebase--interactive: don't require what's rebased to be a branch
15471 Makefile: update defaults for modern Cygwin
15473 Eric S. Raymond (1):
15474 Integrate version 3 ciabot scripts into contrib/.
15476 Erik Faye-Lund (5):
15477 hash-object: support --stdin-paths with --no-filters
15478 git-svn: support fetch with autocrlf on
15479 Revert "git-svn: always initialize with core.autocrlf=false"
15480 cherry: support --abbrev option
15481 ls: remove redundant logic
15484 fallback SSH_ASKPASS when GIT_ASKPASS not set
15485 git-svn: Support retrieving passwords with GIT_ASKPASS
15486 git-core: Support retrieving passwords with GIT_ASKPASS
15488 Hitoshi Mitake (1):
15489 imap-send: support CRAM-MD5 authentication
15491 Ian Ward Comfort (1):
15492 RPM spec: include bash completion support
15494 Ilari Liusvaara (1):
15495 Allow '+', '-' and '.' in remote helper names
15497 Jakub Narębski (2):
15498 gitweb: esc_html (short) error message in die_error
15499 gitweb: Protect escaping functions against calling on undef
15502 git-send-email.perl: improve error message in send_message()
15503 git-send-email.perl: add option --smtp-debug
15504 git-send-email.perl - try to give real name of the calling host to HELO/EHLO
15507 submodule summary: do not shift a non-existent positional variable
15510 git diff --submodule: Show detailed dirty status of submodules
15511 git status: Show detailed dirty status of submodules in long format
15512 git submodule summary: Handle HEAD as argument when on an unborn branch
15513 Refactor dirty submodule detection in diff-lib.c
15514 git status: Fix false positive "new commits" output for dirty submodules
15515 git status: ignoring untracked files must apply to submodules too
15517 Johan Herland (32):
15518 Minor cosmetic fixes to notes.c
15519 Notes API: get_commit_notes() -> format_note() + remove the commit restriction
15520 Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
15521 Notes API: init_notes(): Initialize the notes tree from the given notes ref
15522 Notes API: add_note(): Add note objects to the internal notes tree structure
15523 Notes API: remove_note(): Remove note objects from the notes tree structure
15524 Notes API: get_note(): Return the note annotating the given object
15525 Notes API: for_each_note(): Traverse the entire notes tree with a callback
15526 Notes API: write_notes_tree(): Store the notes tree in the database
15527 Notes API: Allow multiple concurrent notes trees with new struct notes_tree
15528 Refactor notes concatenation into a flexible interface for combining notes
15529 Builtin-ify git-notes
15530 t3301: Verify successful annotation of non-commits
15531 t3305: Verify that adding many notes with git-notes triggers increased fanout
15532 Teach notes code to properly preserve non-notes in the notes tree
15533 Teach builtin-notes to remove empty notes
15534 builtin-notes: Add "remove" subcommand for removing existing notes
15535 t3305: Verify that removing notes triggers automatic fanout consolidation
15536 Notes API: prune_notes(): Prune notes that belong to non-existing objects
15537 builtin-notes: Add "prune" subcommand for removing notes for missing objects
15538 Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
15539 builtin-notes: Add "list" subcommand for listing note objects
15540 builtin-notes: Add --message/--file aliases for -m/-F options
15541 builtin-notes: Add "add" subcommand for adding notes to objects
15542 builtin-notes: Add "append" subcommand for appending to note objects
15543 builtin-notes: Deprecate the -m/-F options for "git notes edit"
15544 builtin-notes: Refactor handling of -F option to allow combining -m and -F
15545 builtin-notes: Add -c/-C options for reusing notes
15546 builtin-notes: Misc. refactoring of argc and exit value handling
15547 builtin-notes: Add "copy" subcommand for copying notes between objects
15548 submodule summary: Don't barf when invoked in an empty repo
15549 builtin-notes: Minor (mostly parse_options-related) fixes
15552 Print RUNTIME_PREFIX warning only when GIT_TRACE is set
15553 Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
15555 Jonathan Nieder (33):
15556 Makefile: add missing header file dependencies
15557 Makefile: make sure test helpers are rebuilt when headers change
15558 Makefile: remove wt-status.h from LIB_H
15559 Makefile: clean up http-walker.o dependency rules
15560 Makefile: drop dependency on $(wildcard */*.h)
15561 Makefile: transport.o depends on branch.h now
15562 Makefile: rearrange dependency rules
15563 Makefile: disable default implicit rules
15564 Makefile: list generated object files in OBJECTS
15565 Makefile: lazily compute header dependencies
15566 Makefile: list standalone program object files in PROGRAM_OBJS
15567 Teach Makefile to check header dependencies
15568 Do not install shell libraries executable
15569 Makefile: tuck away generated makefile fragments in .depend
15570 Makefile: always remove .depend directories on 'make clean'
15571 Makefile: clarify definition of TEST_OBJS
15572 Makefile: Fix occasional GIT-CFLAGS breakage
15573 revert: fix tiny memory leak in cherry-pick --ff
15574 tests: document format of conflicts from checkout -m
15575 tests: document cherry-pick behavior in face of conflicts
15576 xdl_merge(): add optional ancestor label to diff3-style output
15577 xdl_merge(): move file1 and file2 labels to xmparam structure
15578 merge-file --diff3: add a label for ancestor
15579 ll_merge(): add ancestor label parameter for diff3-style output
15580 checkout --conflict=diff3: add a label for ancestor
15581 merge_file(): add comment explaining behavior wrt conflict style
15582 merge_trees(): add ancestor label parameter for diff3-style output
15583 checkout -m --conflict=diff3: add a label for ancestor
15584 compat: add mempcpy()
15585 revert: clarify label on conflict hunks
15586 cherry-pick, revert: add a label for ancestor
15587 merge-recursive: add a label for ancestor
15588 Makefile: future-proof Cygwin version check
15590 Junio C Hamano (25):
15591 builtin-for-each-ref.c: comment fixes
15592 builtin-for-each-ref.c: check if we need to peel onion while parsing the format
15593 for-each-ref --format='%(symref) %(symref:short)'
15594 for-each-ref --format='%(flag)'
15596 Resurrect "git grep --no-index"
15597 Update draft release notes to 1.7.1
15598 notes: fix malformed tree entry
15599 wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
15600 submodule summary: do not fail before the first commit
15601 parse-options: add parse_options_concat() to concat options
15602 builtin/merge: make checkout_fast_forward() non static
15603 revert: add --ff option to allow fast forward when cherry-picking
15604 Update draft release notes to 1.7.1
15605 Documentation: improve description of "git reset --keep"
15606 t4013: add tests for log -p -m --first-parent
15607 revision: introduce setup_revision_opt
15608 show -c: show patch text
15609 show --first-parent/-m: do not default to --cc
15610 Makefile: update check-docs target
15611 t5516: Use test_cmp when appropriate
15612 Update draft release notes to 1.7.1
15613 Update draft release notes to 1.7.1
15614 Revert "Link against libiconv on IRIX"
15618 git-push: fix an advice message so it goes to stderr
15619 git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
15620 git-push: make git push --porcelain print "Done"
15621 git-push: add tests for git push --porcelain
15623 Linus Torvalds (1):
15624 Move 'builtin-*' into a 'builtin/' subdirectory
15626 Marc Branchaud (1):
15627 Teach rebase the --no-ff option.
15630 Add an optional argument for --color options
15631 Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
15632 grep: Colorize filename, line number, and separator
15633 grep: Colorize selected, context, and function lines
15635 Markus Heidelberg (2):
15636 builtin/commit: fix duplicated sentence in a comment
15637 builtin/commit: remove unnecessary variable definition
15639 Michael J Gruber (4):
15640 git-svn: req_svn when needed
15641 t9119-git-svn-info.sh: test with svn 1.6.* as well
15642 Documentation: fix a few typos in git-notes.txt
15643 git-svn: make git svn --version work again
15645 Michael Lukashov (4):
15646 connect.c: move duplicated code to a new function 'get_host_and_port'
15647 refactor duplicated code in builtin-send-pack.c and transport.c
15648 refactor duplicated fill_mm() in checkout and merge-recursive
15649 refactor duplicated encode_header in pack-objects and fast-import
15651 Michele Ballabio (1):
15652 shortlog: warn the user when there is no input
15655 request-pull: avoid mentioning that the start point is a single commit
15657 Nguyễn Thái Ngọc Duy (5):
15658 make_absolute_path(): Do not append redundant slash
15659 init-db, rev-parse --git-dir: do not append redundant slash
15660 Move offset_1st_component() to path.c
15661 Support working directory located at root
15662 Add test for using Git at root of file system
15665 move encode_in_pack_object_header() to a better place
15668 git log -p -m: document -m and honor --first-parent
15671 setenv(GIT_DIR) clean-up
15672 grep: enable threading for context line printing
15675 bash: improve aliased command recognition
15676 bash: support user-supplied completion scripts for user's git commands
15677 bash: support user-supplied completion scripts for aliases
15678 bash: completion for gitk aliases
15680 Stefan-W. Hahn (4):
15681 documentation: 'git-mailsplit --keep-cr' is not hidden anymore
15682 git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
15683 git-am: Add am.keepcr and --no-keep-cr to override it
15684 git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
15687 format-patch: use a string_list for headers
15688 format-patch: add --no-cc, --no-to, and --no-add-headers
15689 send-email: add --no-cc, --no-to, and --no-bcc
15690 notes: rework subcommands and parse options
15691 fmt-merge-msg: be quiet if nothing to merge
15692 t6200: modernize with test_tick
15693 t6200: test fmt-merge-msg more
15694 fmt-merge-msg: use pretty.c routines
15695 string-list: add unsorted_string_list_lookup()
15696 fmt-merge-msg: remove custom string_list implementation
15697 fmt-merge-msg: hide summary option
15700 Add `init.templatedir` configuration variable.
15701 Add a "TEMPLATE DIRECTORY" section to git-init[1].
15702 init: having keywords without value is not a global error.
15703 t/t0001-init.sh: add test for 'init with init.templatedir set'
15704 Add 'git format-patch --to=' option and 'format.to' configuration variable.
15706 Tay Ray Chuan (17):
15707 Documentation/git-clone: mention progress in -v
15708 Documentation/git-pull: put verbosity options before merge/fetch ones
15709 Documentation/git-push: put --quiet before --verbose
15710 fetch: refactor verbosity option handling into transport.[ch]
15711 push: support multiple levels of verbosity
15712 clone: support multiple levels of verbosity
15713 transport->progress: use flag authoritatively
15714 push: learn --progress
15715 fetch and pull: learn --progress
15716 transport: update flags to be in running order
15717 t5541-http-push: check that ref is unchanged for non-ff test
15718 t554[01]-http-push: refactor, add non-ff tests
15719 http-push: remove "|| 1" to enable verbose check
15720 http-walker: cleanup more thoroughly
15721 http: init and cleanup separately from http-walker
15722 remote-curl: use http_fetch_ref() instead of walker wrapper
15723 remote-curl: init walker only when needed
15726 test-lib: unset GIT_NOTES_REF to stop it from influencing tests
15727 Support showing notes from more than one notes tree
15728 Documentation: document post-rewrite hook
15729 commit --amend: invoke post-rewrite hook
15730 rebase: invoke post-rewrite hook
15731 rebase -i: invoke post-rewrite hook
15732 notes: implement 'git notes copy --stdin'
15733 notes: implement helpers needed for note copying during rewrite
15734 rebase: support automatic notes copying
15735 commit --amend: copy notes to the new commit
15736 notes: add shorthand --ref to override GIT_NOTES_REF
15737 notes: track whether notes_trees were changed at all
15738 git-notes(1): add a section about the meaning of history
15739 rebase -i: make post-rewrite work for 'edit'
15741 Tuomas Suutari (5):
15742 t9151: Fix a few commits in the SVN dump
15743 t9151: Add two new svn:mergeinfo test cases
15744 git-svn: Fix discarding of extra parents from svn:mergeinfo
15745 git-svn: Fix merge detecting with rewrite-root
15746 t9150,t9151: Add rewrite-root option to init
15748 YONETANI Tomokazu (1):
15749 Fix _XOPEN_SOURCE problem on DragonFly
15752 git svn: delay importing SVN::Base until it is needed
15755 Version v1.7.0.9; changes since v1.7.0.8:
15756 -----------------------------------------
15758 Jakub Narębski (1):
15759 gitweb: Introduce esc_attr to escape attributes of HTML elements
15761 Junio C Hamano (1):
15765 Version v1.7.0.8; changes since v1.7.0.7:
15766 -----------------------------------------
15768 Jonathan Nieder (1):
15769 add: introduce add.ignoreerrors synonym for add.ignore-errors
15771 Junio C Hamano (1):
15775 Version v1.7.0.7; changes since v1.7.0.6:
15776 -----------------------------------------
15779 Documentation improvements for the description of short format.
15782 git-submodule.sh: properly initialize shell variables
15785 Check size of path buffer before writing into it
15787 Jonathan Nieder (1):
15788 config --get --path: check for unset $HOME
15790 Junio C Hamano (1):
15793 Michael J Gruber (3):
15794 index-pack: fix trivial typo in usage string
15795 Makefile: reenable install with NO_CURL
15796 Documentation/config: describe status.submodulesummary
15799 remove ecb parameter from xdi_diff_outf()
15802 request-pull.txt: Document -p option
15804 Uwe Kleine-König (1):
15805 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
15808 Version v1.7.0.6; changes since v1.7.0.5:
15809 -----------------------------------------
15811 Charles Bailey (1):
15812 Documentation: Describe other situations where -z affects git diff
15815 Makefile: Remove usage of deprecated Python "has_key" method
15818 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
15821 diff: use large integers for diffstat calculations
15824 MSVC: Fix build by adding missing termios.h dummy
15826 Jonathan Nieder (2):
15827 Document new "already-merged" rule for branch -d
15828 Documentation/Makefile: fix interrupted builds of user-manual.xml
15830 Junio C Hamano (1):
15833 Marc Branchaud (1):
15834 Docs: Add -X option to git-merge's synopsis.
15836 Michael J Gruber (3):
15837 rev-list: use default abbrev length when abbrev-commit is in effect
15838 t1010-mktree: Adjust expected result to code and documentation
15839 t7012: Mark missing tests as TODO
15842 reflog: remove 'show' from 'expire's usage string
15845 combined diff: correctly handle truncated file
15848 documentation: clarify direction of core.autocrlf
15851 Version v1.7.0.5; changes since v1.7.0.4:
15852 -----------------------------------------
15855 daemon.c: avoid accessing ss_family member of struct sockaddr_storage
15857 Erik Faye-Lund (1):
15858 rev-list: fix --pretty=oneline with empty message
15860 Gustaf Hendeby (1):
15861 Improve error messages from 'git stash show'
15864 docs: clarify "branch -l"
15867 Let check_preimage() use memset() to initialize "struct checkout"
15869 Junio C Hamano (3):
15870 diff --check: honor conflict-marker-size attribute
15871 blame documentation: -M/-C notice copied lines as well as moved ones
15874 Michael J Gruber (2):
15875 .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
15876 send-email: lazily assign editor variable
15878 R. Tyler Ballance (1):
15879 Correct references to /usr/bin/python which does not exist on FreeBSD
15881 Ramkumar Ramachandra (1):
15882 imap-send: Remove limitation on message body
15884 Shawn O. Pearce (1):
15885 http-backend: Don't infinite loop during die()
15888 pack-protocol.txt: fix spelling
15889 pack-protocol.txt: fix pkt-line lengths
15890 branch: say "Reset to" in reflog entries for 'git branch -f' operations
15891 fetch/push: fix usage strings
15894 Version v1.7.0.4; changes since v1.7.0.3:
15895 -----------------------------------------
15897 Björn Gustavsson (5):
15898 apply: Don't unnecessarily update line lengths in the preimage
15899 apply: Remove the quick rejection test
15900 apply: Allow blank context lines to match beyond EOF
15901 t4124: Add additional tests of --whitespace=fix
15902 t3417: Add test cases for "rebase --whitespace=fix"
15905 test for add with non-existent pathspec
15908 difftool: Fix '--gui' when diff.guitool is unconfigured
15911 Documentation: Clarify support for smart HTTP backend
15914 Don't redefine htonl and ntohl on big-endian
15915 Link against libiconv on IRIX
15916 Documentation: show-ref <pattern>s are optional
15918 Jakub Narębski (1):
15919 gitweb: git_get_project_config requires only $git_dir, not also $project
15922 Updated the usage string of git reset
15925 dir: fix COLLECT_IGNORED on excluded prefixes
15928 diff: fix textconv error zombies
15929 Windows: fix utime() for read-only files
15931 Junio C Hamano (8):
15932 git add -u: die on unmatched pathspec
15933 color: allow multiple attributes
15934 t0050: mark non-working test as such
15935 tests for "git add ignored-dir/file" without -f
15936 refs: ref entry with NULL sha1 is can be a dangling symref
15937 t9350: fix careless use of "cd"
15938 Prepare for 1.7.0.4
15942 format-patch: Squelch 'fatal: Not a range." error
15944 Markus Heidelberg (1):
15945 Documentation: explain the meaning of "-g" in git-describe output
15947 Sverre Rabbelier (1):
15948 fast-export: don't segfault when marks file cannot be opened
15951 Version v1.7.0.3; changes since v1.7.0.2:
15952 -----------------------------------------
15955 prune: honor --expire=never
15956 reflog: honor gc.reflogexpire=never
15958 Andreas Gruenbacher (3):
15959 fetch: Check for a "^{}" suffix with suffixcmp()
15960 fetch: Future-proof initialization of a refspec on stack
15961 fetch: Fix minor memory leak
15963 Dave Olszewski (1):
15964 don't use default revision if a rev was specified
15966 Filippo Negroni (1):
15967 Fix gitmkdtemp: correct test for mktemp() return value
15969 Giuseppe Bilotta (5):
15970 Refactor list of of repo-local env vars
15971 rev-parse: --local-env-vars option
15972 shell setup: clear_local_git_env() function
15973 submodules: ensure clean environment when operating in a submodule
15974 is_submodule_modified(): clear environment properly
15976 Ian Ward Comfort (1):
15977 bash: complete *_HEAD refs if present
15980 daemon: parse_host_and_port SIGSEGV if port is specified
15983 add-interactive: fix bogus diff header line ordering
15984 push: fix segfault for odd config
15986 Jonathan Nieder (1):
15987 Makefile: Fix CDPATH problem
15989 Junio C Hamano (12):
15990 "log --author=me --grep=it" should find intersection, not union
15991 Reword "detached HEAD" notification
15992 mailinfo: do not strip leading spaces even for a header line
15993 t5521: fix and modernize
15994 builtin-fetch --all/--multi: propagate options correctly
15995 fetch --all/--multiple: keep all the fetched branch information
15996 pack-objects documentation: reword "objects that appear in the standard input"
15997 Merge accumulated fixes to prepare for 1.7.0.3
15998 t9400: Use test_cmp when appropriate
15999 t/Makefile: remove test artifacts upon "make clean"
16000 Update draft release notes to 1.7.0.3
16004 grep docs: pluralize "Example" section
16005 grep docs: use AsciiDoc literals consistently
16006 grep docs: --cached and <tree>... are incompatible
16007 grep docs: document --no-index option
16010 Add a testcase for ACL with restrictive umask.
16011 Move gitmkstemps to path.c
16012 git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
16013 Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
16014 git_mkstemps_mode: don't set errno to EINVAL on exit.
16015 Use git_mkstemp_mode instead of plain mkstemp to create object files
16017 Michael J Gruber (7):
16018 Documentation/git-read-tree: fix table layout
16019 Documentation/git-read-tree: clarify 2-tree merge
16020 Documentation/git-reflog: Fix formatting of command lists
16021 Documentation/gitdiffcore: Remove misleading date in heading
16022 Documentation/urls: Remove spurious example markers
16023 Documentation/git-clone: Transform description list into item list
16024 .mailmap: Map the the first submissions of MJG by e-mail
16026 Michael Wookey (1):
16027 run-command.c: fix build warnings on Ubuntu
16030 Documentation: pack-objects: Clarify --local's semantics.
16031 pack-objects documentation: Fix --honor-pack-keep as well.
16034 blame: fix indent of line numbers
16035 for_each_recent_reflog_ent(): use strbuf, fix offset handling
16038 pull: replace unnecessary sed invocation
16041 Documentation: receive.denyCurrentBranch defaults to 'refuse'
16044 Version v1.7.0.2; changes since v1.7.0.1:
16045 -----------------------------------------
16048 unset GREP_OPTIONS in test-lib.sh
16050 Christian Couder (1):
16051 bisect: error out when passing bad path parameters
16053 Dmitry Potapov (1):
16054 hash-object: don't use mmap() for small files
16056 Erik Faye-Lund (1):
16057 run-command: support custom fd-set in async
16059 Gabriel Filion (1):
16060 require_work_tree broken with NONGIT_OK
16062 Hitoshi Mitake (1):
16063 git-imap-send: Convert LF to CRLF before storing patch to draft box
16065 Jakub Narębski (2):
16066 gitweb: Die if there are parsing errors in config file
16067 gitweb: Fix project-specific feature override behavior
16069 Jonathan Nieder (8):
16070 Fix 'git var' usage synopsis
16071 Make 'git var GIT_PAGER' always print the configured pager
16072 git.1: Clarify the behavior of the --paginate option
16073 git svn: Fix launching of pager
16074 am: Fix launching of pager
16075 tests: Add tests for automatic use of pager
16076 t7006-pager: if stdout is not a terminal, make a new one
16077 tests: Fix race condition in t7006-pager
16079 Junio C Hamano (6):
16080 t6000lib: Fix permission
16081 lib-patch-mode.sh: Fix permission
16082 status: preload index to optimize lstat(2) calls
16083 Start preparing for 1.7.0.2
16084 Update draft release notes to 1.7.0.2
16088 git diff --quiet -w: check and report the status
16089 git-diff: add a test for git diff --quiet -w
16092 stash: suggest the correct command line for unknown options.
16095 Remove extra '-' from git-am(1)
16098 fast-import: start using struct pack_idx_entry
16099 fast-import: use sha1write() for pack data
16100 fast-import: use write_idx_file() instead of custom code
16101 fast-import: make default pack size unlimited
16102 fast-import: honor pack.indexversion and pack.packsizelimit config vars
16103 fast-import: use the diff_delta() max_delta_size argument
16104 sha1_file: don't malloc the whole compressed result when writing out objects
16105 sha1_file: be paranoid when creating loose objects
16108 utf8.c: remove print_wrapped_text()
16109 utf8.c: remove print_spaces()
16110 utf8.c: remove strbuf_write()
16111 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
16113 Shawn O. Pearce (7):
16114 run-command: Allow stderr to be a caller supplied pipe
16115 send-pack: demultiplex a sideband stream with status data
16116 receive-pack: Refactor how capabilities are shown to the client
16117 receive-pack: Wrap status reports inside side-band-64k
16118 receive-pack: Send hook output over side band #2
16119 t5401: Use a bare repository for the remote peer
16120 receive-pack: Send internal errors over side-band #2
16123 t7406: Fix submodule init config tests
16126 gitweb multiple project roots documentation
16129 transport: add got_remote_refs flag
16132 cherry_pick_list: quit early if one side is empty
16135 Version v1.7.0.1; changes since v1.7.0:
16136 ---------------------------------------
16139 Documentation: mention conflict marker size argument (%L) for merge driver
16140 rerere: fix memory leak if rerere images can't be read
16143 git-p4: fix bug in symlink handling
16146 Documentation: Fix indentation problem in git-commit(1)
16149 accept "git grep -- pattern"
16150 cherry-pick: rewrap advice message
16151 cherry-pick: refactor commit parsing code
16152 cherry-pick: format help message as strbuf
16153 cherry-pick: show commit name instead of sha1
16154 cherry-pick: prettify the advice message
16155 dwim_ref: fix dangling symref warning
16156 docs: don't talk about $GIT_DIR/refs/ everywhere
16157 rm: fix bug in recursive subdirectory removal
16160 t3301-notes: insert a shbang line in ./fake_editor.sh
16162 Jonathan Nieder (1):
16163 am: remove rebase-apply directory before gc
16165 Junio C Hamano (6):
16166 Typofixes outside documentation area
16167 Start 1.7.0 maintenance track
16168 Fix use of mutex in threaded grep
16169 Prepare 1.7.0.1 release notes
16170 Update 1.7.0.1 release notes
16174 diff: make sure --output=/bad/path is caught
16177 grep documentation: clarify what files match
16178 Remove reference to GREP_COLORS from documentation
16180 Markus Heidelberg (1):
16181 sha1_name: fix segfault caused by invalid index access
16184 commit: quote the user name in the example
16187 Remove hyphen from "git-command" in two error messages
16190 fix minor memory leak in get_tree_entry()
16193 Documentation: describe --thin more accurately
16196 stash pop: remove 'apply' options during 'drop' invocation
16197 t1450: fix testcases that were wrongly expecting failure
16200 Version v1.7.0; changes since v1.7.0-rc2:
16201 -----------------------------------------
16203 Brian Gernhardt (1):
16204 t3902: Protect against OS X normalization
16207 filter-branch: Fix error message for --prune-empty --commit-filter
16210 blame: prevent a segv when -L given start > EOF
16213 am: switch --resolved to --continue
16215 Junio C Hamano (11):
16216 git-add documentation: Fix shell quoting example
16217 Fix parsing of imap.preformattedHTML and imap.sslverify
16218 git-push: document all the status flags used in the output
16219 check-ref-format documentation: fix enumeration mark-up
16220 t8003: check exit code of command and error message separately
16222 Update draft release notes to 1.7.0 one more time
16223 archive documentation: attributes are taken from the tree by default
16224 Re-fix check-ref-format documentation mark-up
16225 Fix typo in 1.6.6.2 release notes
16228 Michael J Gruber (1):
16229 Documentation: minor fixes to RelNotes-1.7.0
16232 Revert "pack-objects: fix pack generation when using pack_size_limit"
16235 bash: support 'git am's new '--continue' option
16238 Documentation: quote braces in {upstream} notation
16241 Version v1.7.0-rc2; changes since v1.7.0-rc1:
16242 ---------------------------------------------
16245 git-svn: persistent memoization
16248 configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM
16249 configure: Allow --without-python
16251 Björn Gustavsson (1):
16252 bash: support the --autosquash option for rebase
16254 Brian Gernhardt (2):
16255 t9501: Skip testing load if we can't detect it
16256 t9501: Re-fix max load test
16258 Christian Stimming (1):
16259 git-gui: Update German translation (12 new or changed strings).
16262 Make NO_PTHREADS the sole thread configuration variable
16264 Emmanuel Trillaud (1):
16265 git-gui: update french translation
16267 Giuseppe Bilotta (4):
16268 git-gui: handle non-standard worktree locations
16269 git-gui: handle bare repos correctly
16270 git-gui: update shortcut tools to use _gitworktree
16271 git-gui: set GIT_DIR and GIT_WORK_TREE after setup
16274 git-gui: fix shortcut for menu "Commit/Revert Changes"
16276 Jakub Narębski (1):
16277 gitweb: Make running t9501 test with '--debug' reliable and usable
16280 git-gui: Support applying a range of changes at once
16283 mention new shell execution behavior in release notes
16284 docs: fix filter-branch example for quoted paths
16285 Fix invalid read in quote_c_style_counted
16288 git-gui: Use git diff --submodule when available
16289 git-gui: Add a special diff popup menu for submodules
16290 git-gui: Quote git path when starting another gui in a submodule
16291 Fix memory leak in submodule.c
16292 Updates for dirty submodules in release notes and user manual
16294 John 'Warthog9' Hawley (7):
16295 gitweb: Load checking
16296 gitweb: Makefile improvements
16297 gitweb: Check that $site_header etc. are defined before using them
16298 gitweb: add a "string" variant of print_local_time
16299 gitweb: add a "string" variant of print_sort_th
16300 gitweb: Add optional extra parameter to die_error, for extended explanation
16301 gitweb: Simplify (and fix) chop_str
16303 Junio C Hamano (7):
16304 RPM packaging: use %global inside %{!?...}
16305 Update draft release notes to 1.7.0
16306 build: make code "-Wpointer-arith" clean
16307 fast-import.c: Fix big-file-threshold parsing bug
16308 fast-import: count --max-pack-size in bytes
16309 Revert 30816237 and 7e62265
16310 Update draft release notes to 1.7.0
16312 Michael J Gruber (1):
16313 git-clean: fix the description of the default behavior
16316 filter-branch: Fix to allow replacing submodules with another content
16317 filter-branch: Add tests for submodules in tree-filter
16319 Michele Ballabio (1):
16320 git-gui: update Italian translation
16322 Nanako Shiraishi (1):
16323 git-gui: update Japanese translation
16326 fix multiple issues with t5300
16327 pack-objects: fix pack generation when using pack_size_limit
16328 make --max-pack-size argument to 'git pack-object' count in bytes
16329 update git-repack documentation wrt repack.UseDeltaBaseOffset
16331 Pal-Kristian Engstad (1):
16332 git-p4: Fix sync errors due to new server version
16335 git-gui: use themed tk widgets with Tk 8.5
16337 Paul Mackerras (1):
16338 gitk: Fix copyright symbol in About box message
16340 Peter Krefting (1):
16341 git-gui: Update Swedish translation (520t0f0u)
16343 Peter Oberndorfer (1):
16344 git-gui: use different icon for new and modified files in the index
16346 Ralf Wildenhues (1):
16347 Fix typos in technical documentation.
16350 grep: simplify assignment of ->fixed
16351 archive: simplify archive format guessing
16353 Shawn O. Pearce (4):
16354 git-gui: Remove unused icon file_parttick
16355 git-gui: Update translation template
16356 fast-import: Stream very large blobs directly to pack
16357 Correct spelling of 'REUC' extension
16359 Wesley J. Landaker (1):
16360 Update git fsck --full short description to mention packs
16363 Version v1.7.0-rc1; changes since v1.7.0-rc0:
16364 ---------------------------------------------
16366 Alejandro Riveira Fernández (1):
16367 Add test-run-command to .gitignore
16369 Benjamin Kramer (1):
16370 grep: use REG_STARTEND (if available) to speed up regexec
16372 Christian Couder (1):
16373 gitk: Add "--no-replace-objects" option
16375 Christian Stimming (1):
16376 gitk: Update German translation
16379 grep: Fix two memory leaks
16382 gitk: Enable gitk to create tags with messages
16383 gitk: Fix display of newly-created tags
16385 Emmanuel Trillaud (1):
16386 gitk: Add French translation
16388 Fredrik Kuivinen (1):
16392 git-cvsserver: allow regex metacharacters in CVSROOT
16394 Ilari Liusvaara (7):
16395 Support addresses with ':' in git-daemon
16396 Allow use of []-wrapped addresses in git://
16398 Fix integer overflow in patch_delta()
16399 Fix integer overflow in unpack_sha1_rest()
16400 Fix integer overflow in unpack_compressed_entry()
16401 Fix remote.<remote>.vcs
16404 t0101: use absolute date
16405 rerere: fix too-short initialization
16406 test combinations of @{} syntax
16407 fix parsing of @{-1}@{u} combination
16408 reject @{-1} not at beginning of object name
16409 fix memcpy of overlapping area
16410 fix off-by-one allocation error
16411 add shebang line to git-mergetool--lib.sh
16414 git diff: Don't test submodule dirtiness with --ignore-submodules
16415 Teach diff --submodule that modified submodule directory is dirty
16418 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
16421 git_connect: use use_shell instead of explicit "sh", "-c"
16422 Implement pthread_cond_broadcast on Windows
16424 Junio C Hamano (13):
16425 Make ce_uptodate() trustworthy again
16426 grep: expose "status-only" feature via -q
16427 Fix log -g this@{upstream}
16428 approxidate_careful() reports errorneous date string
16429 work around an obnoxious bash "safety feature" on OpenBSD
16430 Update @{bogus.timestamp} fix not to die()
16431 t0101: use a fixed timestamp when searching in the reflog
16432 transport_get(): drop unnecessary check for !remote
16433 tests: update tests that used to fail
16434 grep --quiet: finishing touches
16435 Update draft release notes to 1.7.0
16436 RPM packaging: don't include foreign-scm-helper bits yet
16437 is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
16439 Kirill Smelkov (1):
16440 gitk: Display submodule diffs with appropriate encoding
16443 gitk: Add Hungarian translation
16445 Markus Heidelberg (2):
16446 gitk: Adjust two equal strings which differed in whitespace
16447 rebase: don't invoke the pager for each commit summary
16449 Michele Ballabio (1):
16450 gitk: update Italian translation
16453 gitk: Update Hungarian translation
16455 Peter Krefting (1):
16456 gitk: Update Swedish translation
16459 bash: don't offer remote transport helpers as subcommands
16460 bash: support 'git notes' and its subcommands
16462 Sebastian Schuberth (1):
16463 If deriving SVN_SSH from GIT_SSH on msys, also add quotes
16466 rebase: replace antiquated sed invocation
16467 commit-tree: remove unused #define
16468 tests: consolidate CR removal/addition functions
16469 t0022: replace non-portable literal CR
16470 am: fix patch format detection for Thunderbird "Save As" emails
16471 fix portability issues with $ in double quotes
16474 t5541-http-push: make grep expression check for one line only
16477 Version v1.7.0-rc0; changes since v1.6.6.3:
16478 -------------------------------------------
16480 Andreas Gruenbacher (2):
16481 builtin-apply.c: Skip filenames without enough components
16482 builtin-apply.c: fix the --- and +++ header filename consistency check
16485 git-svn: ignore changeless commits when checking for a cherry-pick
16486 git-svn: handle merge-base failures
16487 git-svn: update svn mergeinfo test suite
16489 Andrzej K. Haczewski (1):
16490 MSVC: Windows-native implementation for subset of Pthreads API
16492 Avery Pennarun (3):
16493 git merge -X<option>
16494 Teach git-pull to pass -X<option> to git-merge
16495 Extend merge-subtree tests to test -Xsubtree=dir.
16497 Bart Trojanowski (1):
16498 hg-to-git: fix COMMITTER type-o
16501 cvsimport: modernize callouts to git subcommands
16502 cvsimport: standarize open() calls to external git tools
16503 cvsimport: standarize system() calls to external git tools
16506 Test update-index for a gitlink to a .git file
16507 Handle relative paths in submodule .git files
16509 Christian Couder (8):
16510 reset: improve mixed reset error message when in a bare repo
16511 Documentation: reset: add some tables to describe the different options
16512 reset: add a few tests for "git reset --merge"
16513 Documentation: reset: add some missing tables
16514 t7111: check that reset options work as described in the tables
16515 help: fix configured help format taking over command line one
16516 t7111: fix bad HEAD in tests with unmerged entries
16517 Documentation: rev-list: fix synopsys for --tags and and --remotes
16519 Daniel Barkalow (9):
16520 Fix memory leak in helper method for disconnect
16521 Allow programs to not depend on remotes having urls
16522 Use a function to determine whether a remote is valid
16523 Allow fetch to modify refs
16524 Add a config option for remotes to specify a foreign vcs
16525 Add support for "import" helper command
16526 Allow helper to map private ref names into normal names
16527 Allow helpers to report in "list" command that the ref is unchanged
16528 Replace parse_blob() with an explanatory comment
16530 David Aguilar (11):
16531 t7800-difftool: Set a bogus tool for use by tests
16532 git-difftool: Add '--gui' for selecting a GUI tool
16533 difftool--helper: Update copyright and remove distracting comments
16534 difftool--helper: Remove use of the GIT_MERGE_TOOL variable
16535 difftool: Allow specifying unconfigured commands with --extcmd
16536 git-diff.txt: Link to git-difftool
16537 t7800-difftool.sh: Simplify the --extcmd test
16538 difftool: Add '-x' and as an alias for '--extcmd'
16539 difftool: Use eval to expand '--extcmd' expressions
16540 difftool: Update copyright notices to list each year separately
16541 t7800-difftool.sh: Test mergetool.prompt fallback
16543 Erik Faye-Lund (2):
16544 daemon: consider only address in kill_some_child()
16545 Windows: disable Python
16547 Felipe Contreras (1):
16548 General --quiet improvements
16551 No diff -b/-w output for all-whitespace changes
16553 Horst H. von Brand (1):
16554 git-rebase.txt: Fix spelling
16557 git-svn: fix mismatched src/dst errors for branch/tag
16558 git-svn: respect commiturl option for branch/tag
16559 git-svn: add --username/commit-url options for branch/tag
16560 git-svn: document --username/commit-url for branch/tag
16562 Ilari Liusvaara (15):
16563 Add remote helper debug mode
16564 Support mandatory capabilities
16565 Pass unknown protocols to external protocol handlers
16566 Refactor git transport options parsing
16567 Support taking over transports
16568 Support remote helpers implementing smart transports
16569 Support remote archive from all smart transports
16570 Remove special casing of http, https and ftp
16571 Reset possible helper before reusing remote structure
16572 Improve error message when a transport helper was not found
16573 Add push --set-upstream
16574 Add git remote set-url
16575 Add branch --set-upstream
16577 rev-parse --branches/--tags/--remotes=pattern
16579 Jakub Narębski (1):
16580 gitweb.js: Workaround for IE8 bug
16582 James P. Howard, II (1):
16583 commit: support commit.status, --status, and --no-status
16586 builtin-push: add --delete as syntactic sugar for :foo
16589 git-svn: allow UUID to be manually remapped via rewriteUUID
16590 git-svn: allow subset of branches/tags to be specified in glob spec
16593 status: typo fix in usage
16594 status: refactor short-mode printing to its own function
16595 status: refactor format option parsing
16596 status: add --porcelain output format
16597 commit: support alternate status formats
16598 docs: note that status configuration affects only long format
16599 tests: rename duplicate t1009
16600 status: disable color for porcelain format
16601 status: reduce duplicated setup code
16602 tests: handle NO_PYTHON setting
16603 run-command: add "use shell" option
16604 run-command: convert simple callsites to use_shell
16605 run-command: optimize out useless shell calls
16606 editor: use run_command's shell feature
16607 textconv: use shell to run helper
16608 diff: run external diff helper with shell
16609 strbuf_expand: convert "%%" to "%"
16610 strbuf: add strbuf_addbuf_percentquote
16611 commit: show interesting ident information in summary
16612 commit: allow suppression of implicit identity advice
16615 Show submodules as modified when they contain a dirty work tree
16616 git status: Show uncommitted submodule changes too when enabled
16617 Performance optimization for detection of modified submodules
16620 diff.c: fix typoes in comments
16623 Basic build infrastructure for Python scripts
16624 fast-import: Proper notes tree manipulation
16625 Rename t9301 to t9350, to make room for more fast-import tests
16626 Add more testcases to test fast-import of notes
16628 Johannes Schindelin (2):
16629 Allow specifying the remote helper in the url
16630 Introduce <branch>@{upstream} notation
16632 Johannes Sixt (16):
16633 Make test case number unique
16634 filter-branch: remove an unnecessary use of 'git read-tree'
16635 t0021: use $SHELL_PATH for the filter script
16636 t4030, t4031: work around bogus MSYS bash path conversion
16637 start_command: report child process setup errors to the parent's stderr
16638 run-command: move wait_or_whine earlier
16639 start_command: detect execvp failures early
16640 Windows: boost startup by avoiding a static dependency on shell32.dll
16641 Windows: simplify the pipe(2) implementation
16642 Windows: avoid the "dup dance" when spawning a child process
16643 Do not use date.c:tm_to_time_t() from compat/mingw.c
16644 Makefile: honor NO_CURL when setting REMOTE_CURL_* variables
16645 Make test case numbers unique
16646 Make 'rerere forget' work from a subdirectory.
16647 merge-tree: remove unnecessary call of git_extract_argv0_path
16648 Make test numbers unique
16650 Jonathan Nieder (15):
16651 Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS
16652 Makefile: regenerate assembler listings when asked
16653 Makefile: use target-specific variable to pass flags to cc
16654 Makefile: learn to generate listings for targets requiring special flags
16655 Makefile: consolidate .FORCE-* targets
16656 Documentation: git gc packs refs by default now
16657 Documentation: tiny git config manual tweaks
16658 Documentation: merge: move configuration section to end
16659 Documentation: suggest `reset --merge` in How Merge Works section
16660 Documentation: merge: move merge strategy list to end
16661 Documentation: merge: add an overview
16662 Documentation: emphasize when git merge terminates early
16663 Documentation: merge: add a section about fast-forward
16664 Documentation: simplify How Merge Works
16665 Documentation: merge: use MERGE_HEAD to refer to the remote branch
16667 Junio C Hamano (96):
16668 Refuse updating the current branch in a non-bare repository via push
16669 Refuse deleting the current branch via push
16670 diff: change semantics of "ignore whitespace" options
16671 diff: Rename QUIET internal option to QUICK
16672 git stat: the beginning of "status that is not a dry-run of commit"
16673 git stat -s: short status output
16674 git status: not "commit --dry-run" anymore
16675 send-email: make --no-chain-reply-to the default
16676 "checkout A...B" switches to the merge base between A and B
16677 "rebase --onto A...B" replays history on the merge base between A and B
16678 git-merge-file --ours, --theirs
16679 Teach --[no-]rerere-autoupdate option to merge, revert and friends
16680 commit/status: check $GIT_DIR/MERGE_HEAD only once
16681 commit/status: "git add <path>" is not necessarily how to resolve
16682 status/commit: do not suggest "reset HEAD <path>" while merging
16683 builtin-merge.c: use standard active_cache macros
16684 resolve-undo: record resolved conflicts in a new index extension section
16685 resolve-undo: basic tests
16686 resolve-undo: allow plumbing to clear the information
16687 resolve-undo: "checkout -m path" uses resolve-undo information
16688 resolve-undo: teach "update-index --unresolve" to use resolve-undo info
16689 rerere: remove silly 1024-byte line limit
16690 Kick off 1.7.0 cycle
16691 Remove http.authAny
16692 branch -d: base the "already-merged" safety on the branch it merges with
16693 "reset --merge": fix unmerged case
16694 tests: move convenience regexp to match object names to test-lib.sh
16695 more D/F conflict tests
16696 traverse_trees(): handle D/F conflict case sanely
16697 Aggressive three-way merge: fix D/F case
16698 Fix bit assignment for CE_CONFLICTED
16699 .gitattributes: detect 8-space indent in shell scripts
16700 unpack-trees.c: prepare for looking ahead in the index
16701 unpack-trees.c: look ahead in the index
16702 read-tree --debug-unpack
16703 Describe second batch for 1.7.0 in draft release notes
16704 ident.c: remove unused variables
16705 t3001: test ls-files -o ignored/dir
16706 read_directory_recursive(): refactor handling of a single path into a separate function
16707 read_directory(): further split treat_path()
16708 ls-files: fix overeager pathspec optimization
16709 ident.c: check explicit identity for name and email separately
16710 ident.c: treat $EMAIL as giving user.email identity explicitly
16711 rerere: refactor rerere logic to make it independent from I/O
16712 rerere forget path: forget recorded resolution
16713 bisect.c: mark file-local function static
16714 builtin-rev-list.c: mark file-local function static
16715 pretty.c: mark file-local function static
16716 grep: optimize built-in grep by skipping lines that do not hit
16717 http.c: mark file-local functions static
16718 entry.c: mark file-local function static
16719 parse-options.c: mark file-local function static
16720 read-cache.c: mark file-local functions static
16721 remote-curl.c: mark file-local function static
16722 quote.c: mark file-local function static
16723 submodule.c: mark file-local function static
16724 utf8.c: mark file-local function static
16725 mailmap.c: remove unused function
16726 sha1_file.c: remove unused function
16727 strbuf.c: remove unused function
16728 grep: rip out support for external grep
16729 grep: rip out pessimization to use fixmatch()
16730 t7502: test commit.status, --status and --no-status
16731 strbuf_addbuf(): allow passing the same buf to dst and src
16732 grep: prepare to run outside of a work tree
16733 grep --no-index: allow use of "git grep" outside a git repository
16734 Teach diff that modified submodule directory is dirty
16735 git_attr(): fix function signature
16736 xdl_merge(): introduce xmparam_t for merge specific parameters
16737 xdl_merge(): allow passing down marker_size in xmparam_t
16738 merge-tree: use ll_merge() not xdl_merge()
16739 rerere: use ll_merge() instead of using xdl_merge()
16740 conflict-marker-size: new attribute
16741 commit.c::print_summary: do not release the format string too early
16742 rerere: prepare for customizable conflict marker length
16743 rerere: honor conflict-marker-size attribute
16744 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
16745 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
16746 Update COPYING with GPLv2 with new FSF address
16747 Update draft release notes to 1.7.0
16748 pull: Fix parsing of -X<option>
16749 Make "subtree" part more orthogonal to the rest of merge-recursive.
16750 Document that merge strategies can now take their own options
16751 object.c: remove unused functions
16752 symlinks.c: remove unused functions
16753 Update draft release notes to 1.7.0
16754 Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
16755 t1506: more test for @{upstream} syntax
16756 Teach @{upstream} syntax to strbuf_branchanme()
16757 date.c: mark file-local function static
16758 Update draft release notes to 1.7.0
16759 conflict-marker-size: add test and docs
16760 git-mv: fix moving more than one source to a single destination
16761 Update draft release notes to 1.7.0
16762 rebase -i: Export GIT_AUTHOR_* variables explicitly
16763 pull: re-fix command line generation
16765 Linus Torvalds (11):
16766 Remove diff machinery dependency from read-cache
16767 slim down "git show-index"
16768 make "git merge-tree" a built-in
16769 make "git hash-object" a built-in
16770 make "git var" a built-in
16771 make "git patch-id" a built-in
16772 make "merge-index" a built-in
16773 make "mktag" a built-in
16774 make "git unpack-file" a built-in
16775 make "git pack-redundant" a built-in
16776 make "index-pack" a built-in
16778 Martin Storsjö (2):
16779 Add an option for using any HTTP authentication scheme, not only basic
16780 Allow curl to rewind the RPC read buffer
16782 Matthew Ogilvie (3):
16783 build dashless "bin-wrappers" directory similar to installed bindir
16784 run test suite without dashed git-commands in PATH
16785 INSTALL: document a simpler way to run uninstalled builds
16788 Detailed diagnosis when parsing an object name fails.
16789 builtin-config: add --path option doing ~ and ~user expansion.
16790 push: spell 'Note about fast-forwards' section name correctly in error message.
16791 Be more user-friendly when refusing to do something because of conflict.
16792 lockfile: show absolute filename in unable_to_lock_message
16793 branch: warn and refuse to set a branch as a tracking branch of itself.
16795 Michael Haggerty (25):
16796 t3404: Use test_commit to set up test repository
16797 Add a command "fixup" to rebase --interactive
16798 lib-rebase: Provide clearer debugging info about what the editor did
16799 lib-rebase: Allow comments and blank lines to be added to the rebase script
16800 rebase-i: Ignore comments and blank lines in peek_next_command
16801 rebase -i: Make the condition for an "if" more transparent
16802 rebase -i: Remove dead code
16803 rebase -i: Inline expression
16804 rebase -i: Use "test -n" instead of "test ! -z"
16805 rebase -i: Use symbolic constant $MSG consistently
16806 rebase -i: Document how temporary files are used
16807 rebase -i: Introduce a constant AUTHOR_SCRIPT
16808 rebase -i: Introduce a constant AMEND
16809 t3404: Test the commit count in commit messages generated by "rebase -i"
16810 rebase -i: Improve consistency of commit count in generated commit messages
16811 rebase -i: Simplify commit counting for generated commit messages
16812 rebase -i: Extract a function "commit_message"
16813 rebase -i: Handle the author script all in one place in do_next
16814 rebase -i: Extract function do_with_author
16815 rebase -i: Change function make_squash_message into update_squash_message
16816 rebase -i: For fixup commands without squashes, do not start editor
16817 t3404: Set up more of the test repo in the "setup" step
16818 rebase -i: Retain user-edited commit messages after squash/fixup conflicts
16819 rebase -i: Avoid non-portable "test X -a Y"
16820 rebase -i: Enclose sed command substitution in quotes
16822 Michael J Gruber (7):
16823 status -s: respect the status.relativePaths option
16824 t7508-status.sh: Add tests for status -s
16825 builtin-commit: refactor short-status code into wt-status.c
16826 status -s: obey color.status
16827 t7508-status: status --porcelain ignores relative paths setting
16828 t7508-status: test all modes with color
16829 tag -d: print sha1 of deleted tag
16831 Michael Lukashov (1):
16832 Windows: Remove dependency on pthreadGC2.dll
16835 builtin-commit: add --date option
16836 Document date formats accepted by parse_date()
16838 Nanako Shiraishi (3):
16839 rebase -i --autosquash: auto-squash commits
16840 rebase: fix --onto A...B parsing and add tests
16841 rebase -i: teach --onto A...B syntax
16843 Nguyễn Thái Ngọc Duy (27):
16844 update-index: refactor mark_valid() in preparation for new options
16845 Add test-index-version
16846 Introduce "skip-worktree" bit in index, teach Git to get/set this bit
16847 Teach Git to respect skip-worktree bit (reading part)
16848 Teach Git to respect skip-worktree bit (writing part)
16849 Avoid writing to buffer in add_excludes_from_file_1()
16850 Read .gitignore from index if it is skip-worktree
16851 unpack-trees(): carry skip-worktree bit over in merged_entry()
16852 excluded_1(): support exclude files in index
16853 dir.c: export excluded_1() and add_excludes_from_file_1()
16854 Introduce "sparse checkout"
16855 unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
16856 unpack-trees.c: generalize verify_* functions
16857 unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
16858 unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
16859 unpack-trees(): ignore worktree check outside checkout area
16860 read-tree: add --no-sparse-checkout to disable sparse checkout support
16861 Add tests for sparse checkout
16862 sparse checkout: inhibit empty worktree
16863 ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
16864 commit: correctly respect skip-worktree bit
16865 grep: do not do external grep on skip-worktree entries
16866 t7002: set test prerequisite "external-grep" if supported
16867 t7002: test for not using external grep on skip-worktree paths
16868 status: only touch path we may need to check
16869 rm: only refresh entries that we may touch
16870 Fix memory corruption when .gitignore does not end by \n
16873 fix git-p4 editor invocation
16875 Peter Collingbourne (1):
16876 Remove empty directories when checking out a commit with fewer submodules
16879 CVS Server: Support reading base and roots from environment
16881 Ramkumar Ramachandra (1):
16882 Documentation: Update git core tutorial clarifying reference to scripts
16884 Ramsay Allan Jones (5):
16885 MSVC: Fix an "incompatible pointer types" compiler warning
16886 engine.pl: Fix a recent breakage of the buildsystem generator
16887 msvc: Fix an "unrecognized option" linker warning
16888 msvc: Fix a compiler warning due to an incorrect pointer cast
16889 msvc: Add a definition of NORETURN compatible with msvc compiler
16892 Add completion for git-svn mkdirs,reset,and gc
16894 Sebastian Schuberth (1):
16895 Make difftool.prompt fall back to mergetool.prompt
16897 Sergei Organov (1):
16898 cvsserver: make the output of 'update' more compatible with cvs.
16900 Shawn O. Pearce (1):
16901 bash completion: add space between branch name and status flags
16904 reset: use "unpack_trees()" directly instead of "git read-tree"
16907 Add 'git rev-parse --show-toplevel' option.
16908 Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
16910 Sverre Rabbelier (9):
16911 Fix various memory leaks in transport-helper.c
16912 Add Python support library for remote helpers
16913 fast-import: put option parsing code in separate functions
16914 fast-import: put marks reading in its own function
16915 fast-import: add feature command
16916 fast-import: add option command
16917 fast-import: test the new option command
16918 fast-import: allow for multiple --import-marks= arguments
16919 fast-import: add (non-)relative-marks feature
16921 Tarmigan Casebolt (7):
16922 t/lib-http.sh: Restructure finding of default httpd location
16923 Smart-http: check if repository is OK to export before serving it
16924 Smart-http tests: Improve coverage in test t5560
16925 Smart-http tests: Break test t5560-http-backend into pieces
16926 Smart-http tests: Test http-backend without curl or a webserver
16927 Test t5560: Fix test when run with dash
16928 ident.c: replace fprintf with fputs to suppress compiler warning
16930 Tay Ray Chuan (12):
16931 http: maintain curl sessions
16932 builtin-push: don't access freed transport->url
16933 check stderr with isatty() instead of stdout when deciding to show progress
16934 git-clone.txt: reword description of progress behaviour
16935 clone: set transport->verbose when -v/--verbose is used
16936 clone: use --progress to force progress reporting
16937 t5541-http-push.sh: add tests for non-fast-forward pushes
16938 t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
16939 refactor ref status logic for pushing
16940 transport.c::transport_push(): make ref status affect return value
16941 transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
16942 transport-helper.c::push_refs(): emit "no refs" error message
16945 Use warning function instead of fprintf(stderr, "Warning: ...").
16946 string-list: rename the include guard to STRING_LIST_H
16949 Documentation/git-merge: reword references to "remote" and "pull"
16950 Documentation: warn prominently against merging with dirty trees
16951 Documentation: format full commands in typewriter font
16952 Documentation: spell 'git cmd' without dash throughout
16953 Documentation: show-files is now called git-ls-files
16954 Documentation: emphasise 'git shortlog' in its synopsis
16955 Documentation: improve description of --glob=pattern and friends
16956 Documentation: add missing :: in config.txt
16957 Documentation: move away misplaced 'push --upstream' description
16960 Version v1.6.6.3; changes since v1.6.6.2:
16961 -----------------------------------------
16963 Christian Couder (1):
16964 bisect: error out when passing bad path parameters
16966 Erik Faye-Lund (1):
16967 run-command: support custom fd-set in async
16969 Gabriel Filion (1):
16970 require_work_tree broken with NONGIT_OK
16973 Check size of path buffer before writing into it
16975 Hitoshi Mitake (1):
16976 git-imap-send: Convert LF to CRLF before storing patch to draft box
16979 filter-branch: Fix error message for --prune-empty --commit-filter
16981 Jakub Narębski (1):
16982 gitweb: Introduce esc_attr to escape attributes of HTML elements
16985 dwim_ref: fix dangling symref warning
16986 rm: fix bug in recursive subdirectory removal
16989 t3301-notes: insert a shbang line in ./fake_editor.sh
16990 MSVC: Fix build by adding missing termios.h dummy
16992 Junio C Hamano (5):
16993 t6000lib: Fix permission
16994 lib-patch-mode.sh: Fix permission
16995 Re-fix check-ref-format documentation mark-up
16996 Fix typo in 1.6.6.2 release notes
17000 diff: make sure --output=/bad/path is caught
17002 Michael J Gruber (4):
17003 Documentation/git-reflog: Fix formatting of command lists
17004 Documentation/gitdiffcore: Remove misleading date in heading
17005 Documentation/urls: Remove spurious example markers
17006 Documentation/git-clone: Transform description list into item list
17009 Remove extra '-' from git-am(1)
17012 Remove hyphen from "git-command" in two error messages
17015 fix minor memory leak in get_tree_entry()
17016 utf8.c: remove print_wrapped_text()
17017 utf8.c: remove print_spaces()
17018 utf8.c: remove strbuf_write()
17019 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
17021 Shawn O. Pearce (7):
17022 run-command: Allow stderr to be a caller supplied pipe
17023 send-pack: demultiplex a sideband stream with status data
17024 receive-pack: Refactor how capabilities are shown to the client
17025 receive-pack: Wrap status reports inside side-band-64k
17026 receive-pack: Send hook output over side band #2
17027 t5401: Use a bare repository for the remote peer
17028 receive-pack: Send internal errors over side-band #2
17031 request-pull.txt: Document -p option
17034 stash pop: remove 'apply' options during 'drop' invocation
17035 cherry_pick_list: quit early if one side is empty
17037 Uwe Kleine-König (1):
17038 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
17041 Version v1.6.6.2; changes since v1.6.6.1:
17042 -----------------------------------------
17044 Christopher Beelby (1):
17045 git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
17048 git-cvsserver: allow regex metacharacters in CVSROOT
17050 Giuseppe Bilotta (1):
17051 git-gui: work from the .git dir
17053 Ilari Liusvaara (4):
17055 Fix integer overflow in patch_delta()
17056 Fix integer overflow in unpack_sha1_rest()
17057 Fix integer overflow in unpack_compressed_entry()
17060 blame: prevent a segv when -L given start > EOF
17063 git-gui: Fix applying a line when all following lines are deletions
17066 fix memcpy of overlapping area
17069 git-gui: Correct file_states when unstaging partly staged entry
17072 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
17074 Jonathan Nieder (1):
17075 git-gui: Makefile: consolidate .FORCE-* targets
17077 Junio C Hamano (15):
17078 checkout -m path: fix recreating conflicts
17079 status: don't require the repository to be writable
17080 Fix "log" family not to be too agressive about showing notes
17081 Fix "log --oneline" not to show notes
17082 merge-recursive: do not return NULL only to cause segfault
17083 ignore duplicated slashes in make_relative_path()
17084 approxidate_careful() reports errorneous date string
17085 Update @{bogus.timestamp} fix not to die()
17086 t0101: use a fixed timestamp when searching in the reflog
17087 git-add documentation: Fix shell quoting example
17088 Fix parsing of imap.preformattedHTML and imap.sslverify
17089 git-push: document all the status flags used in the output
17090 check-ref-format documentation: fix enumeration mark-up
17091 t8003: check exit code of command and error message separately
17094 Nguyễn Thái Ngọc Duy (1):
17095 Add missing #include to support TIOCGWINSZ on Solaris
17098 git-gui: handle really long error messages in updateindex.
17100 Peter Krefting (1):
17101 git-gui: Fix gitk for branch whose name matches local file
17104 archive: complain about path specs that don't match anything
17105 archive: simplify archive format guessing
17108 bash: don't offer remote transport helpers as subcommands
17110 Shawn O. Pearce (1):
17111 fast-import: Stream very large blobs directly to pack
17114 retry request without query when info/refs?query fails
17116 Vitaly "_Vi" Shukela (1):
17117 git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
17119 Wesley J. Landaker (1):
17120 Update git fsck --full short description to mention packs
17123 Version v1.6.6.1; changes since v1.6.6:
17124 ---------------------------------------
17126 Andreas Gruenbacher (3):
17127 base85 debug code: Fix length byte calculation
17128 base85: encode_85() does not use the decode table
17129 base85: Make the code more obvious instead of explaining the non-obvious
17131 Andreas Schwab (1):
17132 git count-objects: handle packs bigger than 4G
17134 Björn Gustavsson (4):
17135 Documentation: 'git add -A' can remove files
17136 git-add/rm doc: Consistently back-quote
17137 Fix "git remote update" with remotes.defalt set
17138 git-rm doc: Describe how to sync index & work tree
17141 bisect: fix singular/plural grammar nit
17143 Dmitry Potapov (1):
17144 fast-import: tag may point to any object type
17147 commit: --cleanup is a message option
17150 reset: unbreak hard resets with GIT_WORK_TREE
17151 textconv: stop leaking file descriptors
17154 grep: NUL terminate input from a file
17156 Jonathan Nieder (2):
17157 Documentation: git gc packs refs by default now
17158 Documentation: tiny git config manual tweaks
17160 Junio C Hamano (10):
17161 t1200: work around a bug in some implementations of "find"
17162 t4019 "grep" portability fix
17163 Start 1.6.6.X maintenance track
17164 Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
17165 checkout -m: do not try to fall back to --merge from an unborn branch
17166 grep: -L should show empty files
17167 Update draft release notes to 1.6.6.1
17168 Fix mis-backport of t7002
17173 SubmittingPatches: hints to know the status of a submitted patch.
17174 branch: die explicitly why when calling "git branch [-a|-r] branchname".
17175 stash: mention --patch in usage string.
17177 Michael Haggerty (1):
17178 rebase--interactive: Ignore comments and blank lines in peek_next_command
17180 Nathaniel W Filardo (1):
17181 read_index(): fix reading extension size on BE 64-bit archs
17183 Nguyễn Thái Ngọc Duy (2):
17184 Documentation: always respect core.worktree if set
17185 t7102: make the test fail if one of its check fails
17187 Ramkumar Ramachandra (1):
17188 Document git-blame triple -C option
17190 Richard Weinberger (1):
17191 Fix uninitialized variable in get_refs_via_rsync().
17193 Shawn O. Pearce (2):
17194 fast-import: Document author/committer/tagger name is optional
17195 remote-curl: Fix Accept header for smart HTTP connections
17198 octopus: make merge process simpler to follow
17199 octopus: reenable fast-forward merges
17200 octopus: remove dead code
17202 Tarmigan Casebolt (1):
17203 Add git-http-backend to command-list.
17206 bash completion: factor submodules into dirty state
17209 Version v1.6.6; changes since v1.6.6-rc4:
17210 -----------------------------------------
17213 git-svn: Remove obsolete MAXPARENT check
17216 Prevent git blame from segfaulting on a missing author name
17219 git svn: fix --revision when fetching deleted paths
17220 update release notes for git svn in 1.6.6
17221 git svn: lookup new parents correctly from svn:mergeinfo
17222 git svn: branch/tag commands detect username in URLs
17224 Junio C Hamano (1):
17228 git svn: add test for a git svn gc followed by a git svn mkdirs
17231 git-svn: expand the svn mergeinfo test suite, highlighting some failures
17232 git-svn: memoize conversion of SVN merge ticket info to git commit ranges
17233 git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges
17234 git-svn: exclude already merged tips using one rev-list call
17235 git-svn: detect cherry-picks correctly.
17238 Version v1.6.6-rc4; changes since v1.6.6-rc3:
17239 ---------------------------------------------
17241 Björn Gustavsson (1):
17242 rebase -i: abort cleanly if the editor fails to launch
17245 git svn: make empty directory creation gc-aware
17246 t9146: use 'svn_cmd' wrapper
17248 Junio C Hamano (1):
17252 api-strbuf.txt: fix typos and document launch_editor()
17253 technical-docs: document hash API
17256 Version v1.6.6-rc3; changes since v1.6.6-rc2:
17257 ---------------------------------------------
17259 Björn Gustavsson (1):
17260 bash: Support new 'git fetch' options
17263 ignore unknown color configuration
17266 help.autocorrect: do not run a command if the command given is junk
17268 Junio C Hamano (7):
17269 Remove post-upload-hook
17270 Fix archive format with -- on the command line
17272 Update Release Notes for 1.6.6 to remove old bugfixes
17273 worktree: don't segfault with an absolute pathspec without a work tree
17277 Nanako Shiraishi (1):
17278 Illustrate "filter" attribute with an example
17281 Version v1.6.6-rc2; changes since v1.6.6-rc1:
17282 ---------------------------------------------
17285 git-svn: sort svk merge tickets to account for minimal parents
17286 git-svn: Set svn.authorsfile to an absolute path when cloning
17287 git-svn: set svn.authorsfile earlier when cloning
17289 Alexander Gavrilov (1):
17290 git-gui: Increase blame viewer usability on MacOS.
17293 gitk: Skip translation of "wrong Tcl version" message
17296 t4201: use ISO8859-1 rather than ISO-8859-1
17297 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
17299 Clemens Buchacher (1):
17300 git-gui: search 4 directories to improve statistic of gc hint
17303 git svn: log removals of empty directories
17306 git svn: Don't create empty directories whose parents were deleted
17308 Guillermo S. Romero (1):
17309 gitk: Add configuration for UI colour scheme
17312 git gui: make current branch default in "remote delete branch" merge check
17314 Jakub Narębski (1):
17315 gitweb: Describe (possible) gitweb.js minification in gitweb/README
17318 pull: clarify advice for the unconfigured error case
17321 rerere: don't segfault on failure to open rr-cache
17322 reset: improve worktree safety valves
17323 add-interactive: fix deletion of non-empty files
17326 gitk: Fix diffing committed -> staged (typo in diffcmd)
17327 gitk: Use the --submodule option for displaying diffs when available
17329 Jindrich Makovicka (1):
17330 git-gui: suppress RenderBadPicture X error caused by Tk bug
17333 Fix crasher on encountering SHA1-like non-note in notes tree
17335 Junio C Hamano (9):
17336 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
17337 Unconditionally set man.base.url.for.relative.links
17339 Documentation: xmlto 0.0.18 does not know --stringparam
17340 Prepare for 1.6.5.5
17342 Revert recent "git merge <msg> HEAD <commit>..." deprecation
17343 Update draft release notes to 1.6.6 before -rc2
17346 Linus Torvalds (1):
17347 Fix diff -B/--dirstat miscounting of newly added contents
17349 Markus Heidelberg (1):
17350 gitk: Fix "git gui blame" invocation when called from top-level directory
17353 gitk: Add Japanese translation
17354 gitk: Update Japanese translation
17357 gitk: Use themed tk widgets
17358 gitk: Fix errors in the theme patch
17359 gitk: Default to the system colours on Windows
17360 gitk: Fix selection of tags
17362 Paul Mackerras (5):
17363 gitk: Restore scrolling position of diff pane on back/forward in history
17364 gitk: Add a user preference to enable/disable use of themed widgets
17365 gitk: Show diff of commits at end of compare-commits output
17366 gitk: Don't compare fake children when comparing commits
17367 gitk: Improve appearance of radiobuttons and checkbuttons
17370 archive: clarify description of path parameter
17373 bash: update 'git commit' completion
17375 Sitaram Chamarty (1):
17376 gitk: Disable checkout of remote branches
17378 Todd Zullinger (1):
17379 Documentation: Avoid use of xmlto --stringparam
17382 Version v1.6.6-rc1; changes since v1.6.6-rc0:
17383 ---------------------------------------------
17385 Avery Pennarun (1):
17386 builtin-merge.c: call exclude_cmds() correctly.
17388 Benjamin Kramer (1):
17389 Explicitly truncate bswap operand to uint32_t
17392 Give the hunk comment its own color
17393 get_ref_states: strdup entries and free util in stale list
17395 Björn Gustavsson (11):
17396 Teach the --all option to 'git fetch'
17397 Teach the --multiple option to 'git fetch'
17398 Add the configuration option skipFetchAll
17399 Add missing test for 'git remote update --prune'
17400 Re-implement 'git remote update' using 'git fetch'
17401 Clarify and correct -z
17402 apply: apply works outside a repository
17403 apply: Format all options using back-quotes
17404 apply: Use the term "working tree" consistently
17405 Fix over-simplified documentation for 'git log -z'
17406 gitworkflows: Consistently back-quote git commands
17408 Brian Gernhardt (1):
17409 t/gitweb-lib: Split HTTP response with non-GNU sed
17411 Christian Couder (6):
17412 Documentation: add "Fighting regressions with git bisect" article
17413 replace: use a GIT_NO_REPLACE_OBJECTS env variable
17414 Documentation: fix typos and spelling in replace documentation
17415 Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
17416 bisect: simplify calling visualizer using '--bisect' option
17417 Documentation: update descriptions of revision options related to '--bisect'
17420 help: Do not unnecessarily look for a repository
17422 David Soria Parra (1):
17423 Documentation: Document --branch option in git clone synopsis
17426 commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
17428 Felipe Contreras (3):
17429 format-patch: fix parsing of "--" on the command line
17430 format-patch: add test for parsing of "--"
17431 send-email: automatic envelope sender
17433 Horst H. von Brand (1):
17434 git-pull.sh: Fix call to git-merge for new command format
17436 Jakub Narębski (10):
17437 gitweb: Add optional "time to generate page" info in footer
17438 gitweb: Incremental blame (using JavaScript)
17439 gitweb: Colorize 'blame_incremental' view during processing
17440 gitweb: Create links leading to 'blame_incremental' using JavaScript
17441 gitweb: Minify gitweb.js if JSMIN is defined
17442 t/gitweb-lib.sh: Split gitweb output into headers and body
17443 gitweb: Document current snapshot rules via new tests
17444 gitweb.js: Harden setting blamed commit info in incremental blame
17445 gitweb: Make linking to actions requiring JavaScript a feature
17446 gitweb: Add link to other blame implementation in blame views
17449 remote: refactor some logic into get_stale_heads()
17450 teach warn_dangling_symref to take a FILE argument
17451 builtin-fetch: add --prune option
17452 builtin-fetch: add --dry-run option
17455 prune-packed: only show progress when stderr is a tty
17458 t4014-format-patch: do not assume 'test' is available as non-builtin
17459 Add a notice that only certain functions can print color escape codes
17461 Jonathan Nieder (1):
17462 Makefile: do not clean arm directory
17464 Junio C Hamano (19):
17465 mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
17466 Pretty-format: %[+-]x to tweak inter-item newlines
17467 read_revision_from_stdin(): use strbuf
17468 Teach --stdin option to "log" family
17469 setup_revisions(): do not call get_pathspec() too early
17470 Make --stdin option to "log" family read also pathspecs
17471 t9001: test --envelope-sender option of send-email
17472 Add trivial tests for --stdin option to log family
17473 Protect scripted Porcelains from GREP_OPTIONS insanity
17474 builtin-apply.c: pay attention to -p<n> when determining the name
17475 Remove dead code from "git am"
17476 emit_line(): don't emit an empty <SET><RESET> followed by a newline
17477 Update draft release notes to 1.6.6 before merging topics for -rc1
17478 git-merge: a deprecation notice of the ancient command line syntax
17479 Update draft release notes to 1.6.6 before -rc1
17480 Do not misidentify "git merge foo HEAD" as an old-style invocation
17481 merge: do not add standard message when message is given with -m option
17482 Prepare for 1.6.5.4
17486 gitweb: check given hash before trying to create snapshot
17487 gitweb: Smarter snapshot names
17489 Martin Storsjö (3):
17490 Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST
17491 Refactor winsock initialization into a separate function
17492 Enable support for IPv6 on MinGW
17494 Matthew Ogilvie (5):
17495 cvsserver doc: database generally can not be reproduced consistently
17496 config documentation: some configs are auto-set by git-init
17497 t2300: use documented technique to invoke git-sh-setup
17498 t3409 t4107 t7406 t9150: use dashless commands
17499 t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH
17502 merge-recursive: point the user to commit when file would be overwritten.
17503 user-manual: Document that "git merge" doesn't like uncommited changes.
17504 merge-recursive: make the error-message generation an extern function
17505 builtin-merge: show user-friendly error messages for fast-forward too.
17507 Michael J Gruber (1):
17508 Documentation: Fix a few i.e./e.g. mix-ups
17510 Nanako Shiraishi (2):
17511 t1200: fix a timing dependent error
17512 prepare send-email for smoother change of --chain-reply-to default
17515 pack-objects: split implications of --all-progress from progress activation
17517 Ramsay Allan Jones (1):
17518 git-count-objects: Fix a disk-space under-estimate on Cygwin
17521 strbuf_add_wrapped_text(): skip over colour codes
17522 mergetool--lib: simplify guess_merge_tool()
17525 gitweb.js: fix null object exception in initials calculation
17526 instaweb: restart server if already running
17527 gitweb.js: fix padLeftStr() and its usage
17530 remote-curl.c: fix rpc_out()
17532 Uwe Kleine-König (1):
17533 shortlog: respect commit encoding
17536 Version v1.6.6-rc0; changes since v1.6.5.9:
17537 -------------------------------------------
17540 git-gui: Update russian translation
17542 Alexey Borzenkov (1):
17543 git-gui: store wm state and fix wm geometry
17545 Anders Kaseorg (1):
17546 bisect reset: Allow resetting to any commit, not just a branch
17549 configure: add macro to set arbitrary make variables
17550 configure: add settings for gitconfig, editor and pager
17552 Björn Gustavsson (10):
17553 Teach 'rebase -i' the command "reword"
17554 bash: complete more options for 'git rebase'
17555 Teach 'git merge' and 'git pull' the option --ff-only
17556 format-patch: Always generate a patch
17557 format-patch documentation: Remove diff options that are not useful
17558 format-patch documentation: Fix formatting
17559 format-patch: Add "--no-stat" as a synonym for "-p"
17560 bash: add the merge option --ff-only
17561 Fix truncated usage messages
17562 User Manual: Write "Git" instead of "GIT"
17564 Christian Couder (1):
17565 git: add --no-replace-objects option to disable replacing
17567 Clemens Buchacher (2):
17568 remote-helpers: return successfully if everything up-to-date
17569 set httpd port before sourcing lib-httpd
17572 git-gui: Limit display to a maximum number of files
17575 submodule.c: Squelch a "use before assignment" warning
17578 commit: More generous accepting of RFC-2822 footer lines.
17581 git-blame.el: Change how blame information is shown.
17584 git svn: fix fetch where glob is on the top-level URL
17585 git svn: read global+system config for clone+init
17586 git svn: add authorsfile test case for ~/.gitconfig
17587 git svn: attempt to create empty dirs on clone+rebase
17588 git svn: always reuse existing remotes on fetch
17589 git svn: strip leading path when making empty dirs
17591 Erik Faye-Lund (6):
17592 imap-send: use separate read and write fds
17593 imap-send: use run-command API for tunneling
17594 imap-send: fix compilation-error on Windows
17595 imap-send: build imap-send on Windows
17596 mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
17597 mingw: enable OpenSSL
17599 Felipe Contreras (2):
17601 Use 'fast-forward' all over the place
17604 git-gui: remove warning when deleting correctly merged remote branch
17606 Ingmar Vanhassel (1):
17607 import-tars: Add support for tarballs compressed with lzma, xz
17609 Jakub Narębski (4):
17610 gitweb: Add 'show-sizes' feature to show blob sizes in tree view
17611 gitweb: Refactor 'log' action generation, adding git_log_body()
17612 gitweb: Refactor common parts of 'log' and 'shortlog' views
17613 gitweb: Make 'history' view (re)use git_log_generic()
17616 Teach "git describe" --dirty option
17619 imap-send: remove useless uid code
17620 gitignore: root most patterns at the top-level directory
17621 t915{0,1}: use $TEST_DIRECTORY
17624 git-gui: display summary when showing diff of a submodule
17625 git-gui: fix diff for partially staged submodule changes
17626 git submodule add: make the <path> parameter optional
17627 git-gui: fix use of uninitialized variable
17628 add tests for git diff --submodule
17630 Jimmy Angelakos (1):
17631 git-gui: Added Greek translation & glossary
17634 Teach "-m <msg>" and "-F <file>" to "git notes edit"
17635 fast-import: Add support for importing commit notes
17636 t3302-notes-index-expensive: Speed up create_repo()
17637 Add flags to get_commit_notes() to control the format of the note string
17638 Teach notes code to free its internal data structures on request
17639 Teach the notes lookup code to parse notes trees with various fanout schemes
17640 Add selftests verifying that we can parse notes trees with various fanouts
17641 Refactor notes code to concatenate multiple notes annotating the same object
17642 Add selftests verifying concatenation of multiple notes for the same commit
17644 Johannes Schindelin (8):
17645 print_wrapped_text(): allow hard newlines
17646 Add strbuf_add_wrapped_text() to utf8.[ch]
17647 Introduce commit notes
17648 Add a script to edit/inspect notes
17649 Speed up git notes lookup
17650 Add an expensive test for git-notes
17651 Add '%N'-format for pretty-printing commit notes
17652 Add the --submodule option to the diff option family
17655 Windows: use BLK_SHA1 again
17657 Jonathan Nieder (34):
17658 Add tests for git check-ref-format
17659 check-ref-format: simplify --print implementation
17660 Handle more shell metacharacters in editor names
17661 Retire fetch--tool helper to contrib/examples
17662 Show usage string for 'git grep -h'
17663 Show usage string for 'git cherry -h'
17664 Show usage string for 'git commit-tree -h'
17665 Show usage string for 'git merge-ours -h'
17666 Show usage string for 'git show-ref -h'
17667 http-fetch: add missing initialization of argv0_path
17668 Show usage string for 'git check-ref-format -h'
17669 Show usage string for 'git fast-import -h'
17670 Show usage string for 'git get-tar-commit-id -h'
17671 Show usage string for 'git imap-send -h'
17672 Show usage string for 'git mailsplit -h'
17673 Show usage string for 'git merge-one-file -h'
17674 Show usage string for 'git rev-parse -h'
17675 Show usage string for 'git show-index -h'
17676 Show usage string for 'git unpack-file -h'
17677 Show usage string for 'git stripspace -h'
17678 Let 'git http-fetch -h' show usage outside any git repository
17679 Show usage string for 'git http-push -h'
17680 Let 'git <command> -h' show usage without a git dir
17681 Introduce usagef() that takes a printf-style format
17682 merge-{recursive,subtree}: use usagef() to print usage
17683 diff --no-index: make the usage string less scary
17684 Do not use VISUAL editor on dumb terminals
17685 Suppress warnings from "git var -l"
17686 Teach git var about GIT_EDITOR
17687 Teach git var about GIT_PAGER
17688 add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
17689 am -i, git-svn: use "git var GIT_PAGER"
17690 Provide a build time default-editor setting
17691 Speed up bash completion loading
17693 Julian Phillips (4):
17694 fetch: Speed up fetch by rewriting find_non_local_tags
17695 remote: Make ref_remove_duplicates faster for large numbers of refs
17696 fetch: Speed up fetch of large numbers of refs
17697 remote: fix use-after-free error detected by glibc in ref_remove_duplicates
17699 Junio C Hamano (20):
17700 diff-lib.c: fix misleading comments on oneway_diff()
17701 unpack-trees: typofix
17702 unpack_callback(): use unpack_failed() consistently
17703 git check-ref-format --print
17705 check_filename(): make verify_filename() callable without dying
17706 DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
17707 format_commit_message(): fix function signature
17708 fsck: default to "git fsck --full"
17709 git checkout --no-guess
17710 Teach --wrap to only indent without wrapping
17711 Update draft release notes to 1.6.6
17712 Revert "Don't create the $GIT_DIR/branches directory on init"
17713 t1200: further modernize test script style
17714 t1200: prepare for merging with Fast-forward bikeshedding
17715 builtin-commit.c: fix logic to omit empty line before existing footers
17716 git-describe.txt: formatting fix
17717 Provide a build time default-pager setting
17718 Update draft release notes to 1.6.6
17721 Linus Torvalds (1):
17722 Add '--bisect' revision machinery argument
17724 Marius Storm-Olsen (1):
17725 MSVC: Enable OpenSSL, and translate -lcrypto
17728 http-backend: add GIT_PROJECT_ROOT environment var
17729 http-backend: reword some documentation
17730 http-backend: use mod_alias instead of mod_rewrite
17731 http-backend: add example for gitweb on same URL
17732 http-backend: more explict LocationMatch
17735 instaweb: support mod_cgid for apache2
17737 Markus Heidelberg (1):
17738 bash completion: difftool accepts the same options as diff
17740 Michael J Gruber (1):
17741 Make t9150 and t9151 test scripts executable
17744 pack-objects: move thread autodetection closer to relevant code
17746 Ramsay Allan Jones (2):
17747 Makefile: keep MSVC and Cygwin configuration separate
17748 MSVC: Add support for building with NO_MMAP
17751 describe: load refnames before calling describe()
17752 Implement wrap format %w() as if it is a mode switch
17753 log --format: don't ignore %w() at the start of format string
17754 grep: unset GREP_OPTIONS before spawning external grep
17755 strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()
17756 log --format: document %w
17758 Robin Rosenberg (1):
17759 Don't create the $GIT_DIR/branches directory on init
17762 Documentation: add 'git replace' to main git manpage
17765 git-svn: add test data for SVK merge, with script.
17766 git-svn: allow test setup script to support PERL env. var
17767 git-svn: convert SVK merge tickets to extra parents
17768 git-svn: add test data for SVN 1.5+ merge, with script.
17769 git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
17772 mergetool--lib: add p4merge as a pre-configured mergetool option
17773 Update packfile transfer protocol documentation
17775 Sebastian Schuberth (2):
17776 Use faster byte swapping when compiling with MSVC
17777 Make the MSVC projects use PDB/IDB files named after the project
17779 Shawn O. Pearce (27):
17780 git-gui: Ensure submodule path is quoted properly
17781 pkt-line: Add strbuf based functions
17782 pkt-line: Make packet_read_line easier to debug
17783 fetch-pack: Use a strbuf to compose the want list
17784 Move "get_ack()" back to fetch-pack
17785 Add multi_ack_detailed capability to fetch-pack/upload-pack
17786 remote-curl: Refactor walker initialization
17787 fetch: Allow transport -v -v -v to set verbosity to 3
17788 remote-helpers: Fetch more than one ref in a batch
17789 remote-helpers: Support custom transport options
17790 Move WebDAV HTTP push under remote-curl
17791 Git-aware CGI to provide dumb HTTP transport
17792 Add stateless RPC options to upload-pack, receive-pack
17793 Smart fetch and push over HTTP: server side
17794 Discover refs via smart HTTP server when available
17795 Smart push over HTTP: client side
17796 Smart fetch over HTTP: client side
17797 Smart HTTP fetch: gzip requests
17798 http tests: use /dumb/ URL prefix
17799 test smart http fetch and push
17800 http-backend: Use http.getanyfile to disable dumb HTTP serving
17801 http-backend: Test configuration options
17802 Git-aware CGI to provide dumb HTTP transport
17803 http-backend: Protect GIT_PROJECT_ROOT from /../ requests
17804 t5551-http-fetch: Work around some libcurl versions
17805 t5551-http-fetch: Work around broken Accept header in libcurl
17806 http-backend: Fix bad treatment of uintmax_t in Content-Length
17809 rebase -i: fix reword when using a terminal editor
17810 gitweb: linkify author/committer names with search
17811 t1402: Make test executable
17812 t1200: cleanup and modernize test style
17813 t1200: Make documentation and test agree
17814 t3101: test more ls-tree options
17815 ls-tree: migrate to parse-options
17817 Tarmigan Casebolt (3):
17818 Check the format of more printf-type functions
17819 http-backend: Fix access beyond end of string.
17820 http-backend: Let gcc check the format of more printf-type functions.
17823 http-push: fix check condition on http.c::finish_http_pack_request()
17824 t5540-http-push: remove redundant fetches
17827 Documentation: update pt-BR
17830 bash completion: complete refs for git-grep
17831 Let --decorate show HEAD position
17832 Refactor pretty_print_commit arguments into a struct
17833 reflog-walk: refactor the branch@{num} formatting
17834 Introduce new pretty formats %g[sdD] for reflog information
17835 stash list: use new %g formats instead of sed
17836 stash list: drop the default limit of 10 stashes
17837 describe: when failing, tell the user about options that work
17838 filter-branch: stop special-casing $filter_subdir argument
17839 filter-branch: nearest-ancestor rewriting outside subdir filter
17840 Documentation: clarify 'ours' merge strategy
17841 rebase docs: clarify --merge and --strategy
17842 Document git-svn's first-parent rule
17843 describe: do not use unannotated tag even if exact match
17846 git svn: handle SVN merges from revisions past the tip of the branch
17849 git-gui: adjust the minimum height of diff pane for shorter screen height
17852 git-update-index.txt: Document the --really-refresh option.
17855 Version v1.6.5.9; changes since v1.6.5.8:
17856 -----------------------------------------
17858 Björn Gustavsson (3):
17859 Documentation: 'git add -A' can remove files
17860 git-add/rm doc: Consistently back-quote
17861 git-rm doc: Describe how to sync index & work tree
17864 Check size of path buffer before writing into it
17866 Jakub Narębski (1):
17867 gitweb: Introduce esc_attr to escape attributes of HTML elements
17870 blame: prevent a segv when -L given start > EOF
17873 fix memcpy of overlapping area
17874 dwim_ref: fix dangling symref warning
17876 Junio C Hamano (2):
17877 t8003: check exit code of command and error message separately
17881 diff: make sure --output=/bad/path is caught
17884 Remove extra '-' from git-am(1)
17887 octopus: make merge process simpler to follow
17888 octopus: reenable fast-forward merges
17889 octopus: remove dead code
17890 request-pull.txt: Document -p option
17893 stash pop: remove 'apply' options during 'drop' invocation
17895 Uwe Kleine-König (1):
17896 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
17899 Version v1.6.5.8; changes since v1.6.5.7:
17900 -----------------------------------------
17902 Andreas Gruenbacher (3):
17903 base85 debug code: Fix length byte calculation
17904 base85: encode_85() does not use the decode table
17905 base85: Make the code more obvious instead of explaining the non-obvious
17907 Andreas Schwab (1):
17908 git count-objects: handle packs bigger than 4G
17910 Björn Gustavsson (1):
17911 rebase -i: abort cleanly if the editor fails to launch
17914 Prevent git blame from segfaulting on a missing author name
17916 Dmitry Potapov (1):
17917 fast-import: tag may point to any object type
17920 commit: --cleanup is a message option
17923 reset: unbreak hard resets with GIT_WORK_TREE
17924 textconv: stop leaking file descriptors
17927 grep: NUL terminate input from a file
17929 Junio C Hamano (3):
17930 checkout -m: do not try to fall back to --merge from an unborn branch
17931 Fix mis-backport of t7002
17935 branch: die explicitly why when calling "git branch [-a|-r] branchname".
17937 Nguyễn Thái Ngọc Duy (1):
17938 t7102: make the test fail if one of its check fails
17941 api-strbuf.txt: fix typos and document launch_editor()
17942 technical-docs: document hash API
17945 bash completion: factor submodules into dirty state
17948 Version v1.6.5.7; changes since v1.6.5.6:
17949 -----------------------------------------
17952 ignore unknown color configuration
17955 help.autocorrect: do not run a command if the command given is junk
17957 Junio C Hamano (2):
17958 worktree: don't segfault with an absolute pathspec without a work tree
17961 Nanako Shiraishi (1):
17962 Illustrate "filter" attribute with an example
17965 Version v1.6.5.6; changes since v1.6.5.5:
17966 -----------------------------------------
17969 pull: clarify advice for the unconfigured error case
17972 add-interactive: fix deletion of non-empty files
17974 Junio C Hamano (3):
17975 Remove post-upload-hook
17976 Fix archive format with -- on the command line
17980 merge-recursive: make the error-message generation an extern function
17981 builtin-merge: show user-friendly error messages for fast-forward too.
17984 Version v1.6.5.5; changes since v1.6.5.4:
17985 -----------------------------------------
17987 Avery Pennarun (1):
17988 builtin-merge.c: call exclude_cmds() correctly.
17991 t4201: use ISO8859-1 rather than ISO-8859-1
17994 grep: Allow case insensitive search of fixed-strings
17996 Felipe Contreras (2):
17997 format-patch: fix parsing of "--" on the command line
17998 format-patch: add test for parsing of "--"
18001 diffcore-break: free filespec data as we go
18002 diffcore-break: save cnt_data for other phases
18003 rerere: don't segfault on failure to open rr-cache
18004 reset: improve worktree safety valves
18006 Junio C Hamano (7):
18007 diffcore-rename: reduce memory footprint by freeing blob data early
18008 Documentation: avoid xmlto input error
18009 Protect scripted Porcelains from GREP_OPTIONS insanity
18010 Remove dead code from "git am"
18011 Documentation: xmlto 0.0.18 does not know --stringparam
18012 Prepare for 1.6.5.5
18015 Linus Torvalds (1):
18016 Fix diff -B/--dirstat miscounting of newly added contents
18018 Lukas Sandström (1):
18019 git am/mailinfo: Don't look at in-body headers when rebasing
18021 Matthew Ogilvie (1):
18022 core.autocrlf documentation: mention the crlf attribute
18025 Expand ~ and ~user in core.excludesfile, commit.template
18026 expand_user_path: expand ~ to $HOME, not to the actual homedir.
18027 merge-recursive: point the user to commit when file would be overwritten.
18028 user-manual: Document that "git merge" doesn't like uncommited changes.
18031 give priority to progress messages
18033 Philippe Bruhat (1):
18034 Make sure $PERL_PATH is defined when the test suite is run.
18037 Add branch management for releases to gitworkflows
18039 Ramsay Allan Jones (3):
18040 Makefile: merge two Cygwin configuration sections into one
18041 t9700-perl-git.sh: Fix a test failure on Cygwin
18042 git-count-objects: Fix a disk-space under-estimate on Cygwin
18045 mergetool--lib: simplify guess_merge_tool()
18046 archive: clarify description of path parameter
18049 Update 'git remote update' usage string to match man page.
18050 git remote: Separate usage strings for subcommands
18052 Todd Zullinger (1):
18053 Documentation: Avoid use of xmlto --stringparam
18055 Uwe Kleine-König (1):
18056 shortlog: respect commit encoding
18059 Version v1.6.5.4; changes since v1.6.5.3:
18060 -----------------------------------------
18063 help: Do not unnecessarily look for a repository
18065 David Soria Parra (1):
18066 Documentation: Document --branch option in git clone synopsis
18069 Documentation: undocument gc'd function graph_release()
18072 prune-packed: only show progress when stderr is a tty
18074 Junio C Hamano (7):
18075 builtin-apply.c: pay attention to -p<n> when determining the name
18076 Do not misidentify "git merge foo HEAD" as an old-style invocation
18077 merge: do not add standard message when message is given with -m option
18078 Prepare for 1.6.5.4
18079 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
18080 Unconditionally set man.base.url.for.relative.links
18083 Michael J Gruber (1):
18084 Documentation: Fix a few i.e./e.g. mix-ups
18087 pack-objects: split implications of --all-progress from progress activation
18090 instaweb: restart server if already running
18093 Version v1.6.5.3; changes since v1.6.5.2:
18094 -----------------------------------------
18096 Björn Gustavsson (1):
18097 git-clone.txt: Fix grammar and formatting
18099 Björn Steinbrink (1):
18100 pre-commit.sample: Diff against the empty tree when HEAD is invalid
18102 Clemens Buchacher (1):
18103 modernize fetch/merge/pull examples
18105 Daniel Barkalow (2):
18106 Require a struct remote in transport_get()
18107 Allow curl helper to work without a local repository
18109 Dmitry V. Levin (1):
18110 Makefile: add compat/bswap.h to LIB_H
18113 help -i: properly error out if no info viewer can be found
18116 More precise description of 'git describe --abbrev'
18117 Fix documentation grammar typo
18119 Giuseppe Bilotta (1):
18120 gitweb: fix esc_param
18122 Jakub Narębski (1):
18123 gitweb: Do not show 'patch' link for merge commits
18126 rebase -i: more graceful handling of invalid commands
18129 Documentation/fetch-options.txt: order options alphabetically
18130 Documentation/git-pull.txt: Add subtitles above included option files
18131 Documentation/merge-options.txt: order options in alphabetical groups
18134 cvsimport: fix relative argument filenames
18135 push: always load default config
18136 add-interactive: handle deletion of empty files
18137 ls-files: unbreak "ls-files -i"
18138 push: fix typo in usage
18139 format-patch: make "-p" suppress diffstat
18141 Johannes Schindelin (3):
18142 blame: make sure that the last line ends in an LF
18143 help -a: do not unnecessarily look for a repository
18144 diff --color-words -U0: fix the location of hunk headers
18146 Jonathan Nieder (4):
18147 clone: detect extra arguments
18148 Add intermediate build products to .gitignore
18149 check-ref-format: update usage string
18150 merge: do not setup worktree twice
18152 Junio C Hamano (22):
18153 apply --whitespace=fix: fix handling of blank lines at the eof
18154 apply --whitespace=fix: detect new blank lines at eof correctly
18155 apply.c: split check_whitespace() into two
18156 apply --whitespace=warn/error: diagnose blank at EOF
18157 apply --whitespace: warn blank but not necessarily empty lines at EOF
18158 diff.c: the builtin_diff() deals with only two-file comparison
18159 diff --whitespace=warn/error: obey blank-at-eof
18160 diff --whitespace=warn/error: fix blank-at-eof check
18161 diff --color: color blank-at-eof
18162 core.whitespace: split trailing-space into blank-at-{eol,eof}
18163 diff --whitespace: fix blank lines at end
18164 diff.c: shuffling code around
18165 diff.c: split emit_line() from the first char and the rest of the line
18166 diff.c: emit_add_line() takes only the rest of the line
18167 diff -B: colour whitespace errors
18168 info/grafts: allow trailing whitespaces at the end of line
18169 gc --auto --quiet: make the notice a bit less verboase
18170 receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
18171 clone: fix help on options
18172 diff --color-words: bit of clean-up
18173 check-ref-format -h: it does not know the --print option yet
18176 Markus Heidelberg (1):
18177 t4034-diff-words: add a test for word diff without context
18180 gitweb: Fix blob linenr links in pathinfo mode
18182 Sebastian Schuberth (1):
18183 Do not try to remove directories when removing old links
18186 git-add.txt: fix formatting of --patch section
18189 Quote ' as \(aq in manpages
18191 Todd Zullinger (1):
18192 Makefile: Ensure rpm packages can be read by older rpm versions
18195 imap-send.c: fix compiler warnings for OpenSSL 1.0
18198 Version v1.6.5.2; changes since v1.6.5.1:
18199 -----------------------------------------
18201 Andreas Schwab (1):
18202 Work around option parsing bug in the busybox tar implementation
18204 Carlos R. Mafra (1):
18205 Makefile: clean block-sha1/ directory instead of mozilla-sha1/
18208 ls-files: excludes should not impact tracked files
18209 document push's new quiet option
18212 git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
18215 Remove a left-over file from t/t5100
18216 Mark files in t/t5100 as UTF-8
18218 Jonathan Nieder (1):
18219 Documentation: describe check-ref-format --branch
18221 Junio C Hamano (4):
18222 Fix incorrect error check while reading deflated pack data
18223 Do not fail "describe --always" in a tag-less repository
18224 Fix list of released versions in the toc document
18227 Markus Heidelberg (1):
18228 t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
18231 Documentation/git-gc.txt: change "references" to "reference"
18233 Nanako Shiraishi (2):
18234 git push: remove incomplete options list from help text
18235 git push: say that --tag can't be used with --all or --mirror in help text
18237 Nasser Grainawi (1):
18238 Document `delta` attribute in "git help attributes".
18240 Pauli Virtanen (1):
18241 git-add--interactive: never skip files included in index
18244 Version v1.6.5.1; changes since v1.6.5:
18245 ---------------------------------------
18247 Björn Steinbrink (1):
18248 clone: Supply the right commit hash to post-checkout when -b is used
18251 remote-curl: add missing initialization of argv0_path
18253 Junio C Hamano (1):
18257 grep: do not segfault when -f is used
18260 git-stash documentation: mention default options for 'list'
18263 change throughput display units with fast links
18265 Shawn O. Pearce (1):
18266 sha1_file: Fix infinite loop when pack is corrupted
18269 Version v1.6.5; changes since v1.6.5-rc3:
18270 -----------------------------------------
18272 Alexander Gavrilov (1):
18273 git-svn: Avoid spurious errors when rewriteRoot is used.
18276 ls-files: die instead of fprintf/exit in -i error
18278 Björn Gustavsson (1):
18279 bash: add support for 'git replace'
18282 Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64
18283 Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64
18285 Christian Himpel (2):
18286 git-am: fixed patch_format detection according to RFC2822
18287 git-am: force egrep to use correct characters set
18289 Erik Faye-Lund (2):
18290 increase portability of NORETURN declarations
18291 add NORETURN_PTR for function pointers
18293 Felipe Contreras (1):
18294 send-email: fix mutt regex for grouped aliases
18296 Ingmar Vanhassel (1):
18297 import-tars: Add missing closing bracket
18300 improve reflog date/number heuristic
18301 pull: improve advice for unconfigured error case
18303 Jonathan Nieder (8):
18304 Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile
18305 Documentation: git fmt-merge-msg does not have to be a script
18306 Documentation: clarify mergeoptions description
18307 Documentation: branch: update --merged description
18308 Documentation: clarify branch creation
18309 Documentation: clarify "working tree" definition
18310 racy-git.txt: explain nsec problem in more detail
18311 Documentation: clone: clarify discussion of initial branch
18313 Junio C Hamano (2):
18314 Update draft release notes to 1.6.5
18317 Ramsay Allan Jones (2):
18318 Fix MSVC build on cygwin
18319 Fix the exit code of MSVC build scripts on cygwin
18322 Git archive and trailing "/" in prefix
18325 git-svn: hide find_parent_branch output in double quiet mode
18328 completion: fix completion of git <TAB><TAB>
18329 completion: fix alias listings with newlines
18332 Version v1.6.5-rc3; changes since v1.6.5-rc2:
18333 ---------------------------------------------
18336 filter-branch: add --prune-empty to option summary
18338 Andreas Schwab (1):
18339 parse-opt: ignore negation of OPT_NONEG for ambiguity checks
18342 perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR
18343 Documentation/git-gc.txt: default --aggressive window is 250, not 10
18344 Makefile: enable THREADED_DELTA_SEARCH on SunOS
18346 Frederik Schwarzer (1):
18347 Correct minor typo in post-receive hook template
18350 typo fix: Directory `...' exist, ...: s/exist/exists/
18353 Fix '--relative-date'
18355 Junio C Hamano (4):
18356 builtin-mailinfo.c: check error status from rewind and ftruncate
18357 show-branch: fix segfault when showbranch.default exists
18358 git-pull: dead code removal
18359 fast-import.c::validate_raw_date(): really validate the value
18362 tests: make all test files executable
18364 Michael Wookey (1):
18365 generators/vcproj.pm: remove UNICODE from build
18368 git branch -D: give a better error message when lockfile creation fails
18371 make 'git clone' ask the remote only for objects it cares about
18373 Ramsay Allan Jones (1):
18374 Fix some printf format warnings
18377 bash: teach 'git checkout' options
18379 Sebastian Schuberth (2):
18380 Make generated MSVC solution file open from Windows Explorer
18381 Make just opening the generated MSVC solution file not modify it
18384 README: git lives at http://git-scm.com these days
18387 completion: update am, commit, and log
18388 completion: add dirstat and friends to diff options
18391 send-email: fix obscure error when encryption=tls and smtp cannot connect
18394 Version v1.6.5-rc2; changes since v1.6.5-rc1:
18395 ---------------------------------------------
18397 Clemens Buchacher (2):
18398 test local clone by copying
18399 cvs: initialize empty password
18401 Dmitry Potapov (2):
18402 git-archive: add '-o' as a alias for '--output'
18403 git-archive: infer output format from filename when unspecified
18406 Avoid declaration after statement
18407 Change regerror() declaration from K&R style to ANSI C (C89)
18408 Fix __stdcall placement and function prototype
18409 Test for WIN32 instead of __MINGW32_
18410 Add MinGW header files to build git with MSVC
18411 Add platform files for porting to MSVC
18414 remove logical typo in documentation of sample update hook
18415 web--browse: fix Mac OS X GUI detection for 10.6
18418 pre-commit.sample: add comment re tr portability; fix grammar
18420 Johannes Gilger (1):
18421 git-clone doc: typofix
18424 test-genrandom: ensure stdout is set to _O_BINARY on Windows
18426 Junio C Hamano (6):
18427 git-commit doc: remove duplicated --dry-run description
18428 http.c: avoid freeing an uninitialized pointer
18430 Update Release Notes to 1.6.5
18431 pay attention to DESTDIR when building with NO_PERL_MAKEMAKER
18432 pull: Clarify "helpful" message for another corner case
18434 Marius Storm-Olsen (9):
18435 Add include guards to compat/win32.h
18436 Set _O_BINARY as default fmode for both MinGW and MSVC
18437 Add empty header files for MSVC port
18438 Make usage of windows.h lean and mean
18439 Define strncasecmp and ftruncate for MSVC
18440 Add MSVC to Makefile
18441 Add README for MSVC build
18442 Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake)
18443 Tag GIT_VERSION when Git is built with MSVC
18446 push: Correctly initialize nonfastforward in transport_push.
18449 git-push: Accept -n as a synonym for --dry-run.
18452 Nicolas Pitre has a new email address
18455 gitk: Work around leftover temporary save file
18457 Paul Mackerras (1):
18458 gitk: Show diff of commits at end of compare-commits output
18460 Peter Krefting (1):
18461 gitk: Update Swedish translation (280t0f0u)
18464 bash: rename __git_find_subcommand() to __git_find_on_cmdline()
18465 bash: update 'git stash' completion
18466 bash: teach 'git reset --patch'
18469 Update the usage bundle string.
18470 pack-objects: remove SP at the end of usage string
18471 Update "describe" documentation to match reality
18473 Todd Zullinger (1):
18474 completion: Replace config --list with --get-regexp
18477 Version v1.6.5-rc1; changes since v1.6.5-rc0:
18478 ---------------------------------------------
18480 Brian Gernhardt (4):
18481 INSTALL: Update description of our SHA-1 code
18482 Makefile: Add NEEDS_CRYPTO_WITH_SSL
18483 INSTALL: Reorder dependencies, split shell and Perl
18484 INSTALL: Describe dependency knobs from Makefile
18486 Clemens Buchacher (3):
18487 grep: fix exit status if external_grep() punts
18488 grep: accept relative paths outside current working directory
18489 preserve mtime of local clone
18491 Daniel Barkalow (4):
18492 Add support for external programs for handling native fetches
18493 Use an external program to implement fetching with curl
18494 Make the "traditionally-supported" URLs a special case
18495 Use a clearer style to issue commands to remote helpers
18498 Improve --patch option documentation in git-add
18501 Makefile: git-http-fetch does not need expat
18502 push: make non-fast-forward help message configurable
18503 status: make "how to stage" messages optional
18504 rebase: use plumbing to show dirty state
18507 use write_str_in_full helper to avoid literal string lengths
18508 use write_str_in_full helper to avoid literal string lengths
18509 don't dereference NULL upon fdopen failure
18512 start_command: do not clobber cmd->env on Windows code path
18513 pager: set LESS=FRSX also on Windows
18516 Wrap rewrite globals in a struct in preparation for adding another set
18517 Add url.<base>.pushInsteadOf: URL rewriting for push only
18519 Junio C Hamano (7):
18520 Makefile: do not link three copies of git-remote-* programs
18521 Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
18522 merge-recursive: give less scary messages when merge did not start
18523 Makefile: remove remnant of separate http/https/ftp helpers
18525 quiltimport documentation: --dry-run and -n are synonyms
18528 Linus Torvalds (1):
18529 git-http-fetch: not a builtin
18532 svn: properly escape arguments for authors-prog
18534 Martin Nordholts (1):
18535 git.el: Use git-add-file for unmerged files, remove git-resolve-file
18538 wrap git's main usage string.
18541 Add transport native helper executables to .gitignore
18542 http-fetch: Fix Makefile dependancies
18544 Nicolas Sebrecht (2):
18545 mailinfo: add '--scissors' to usage message
18546 add documentation for mailinfo.scissors and '--no-scissors'
18548 Peter Krefting (2):
18549 import-tars: Allow per-tar author and commit message.
18550 Add script for importing bits-and-pieces to Git.
18553 git-p4: Avoid modules deprecated in Python 2.6.
18556 http.c: remove verification of remote packs
18559 Version v1.6.5-rc0; changes since v1.6.4.5:
18560 -------------------------------------------
18563 svn: Add && to t9107-git-svn-migrate.sh
18564 svn: Honor --prefix option in init without --stdlayout
18565 svn: allow branches outside of refs/remotes
18568 graph API: use a new color when starting a brand new column
18569 graph API: fix bug in graph_is_interesting()
18570 Add tests for rev-list --graph with options that simplify history
18573 Add a reminder test case for a merge with F/D transition
18574 Add date formatting and parsing functions relative to a given time
18576 Alexandre Julliard (1):
18577 read-tree: Fix regression with creation of a new index file.
18579 André Goddard Rosa (1):
18580 Fix typos on pt_BR/gittutorial.txt translation
18582 Benjamin Kramer (1):
18583 gitweb: Optimize git-favicon.png
18585 Björn Steinbrink (1):
18586 git-describe: Die early if there are no possible descriptions
18589 strbuf: add new function strbuf_getwholeline()
18590 builtin-mailinfo,builtin-mailsplit: use strbufs
18591 builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
18592 block-sha1/sha1.c: silence compiler complaints by casting void * to char *
18593 git-compat-util.h: remove superfluous test for __sun__
18594 Makefile: remove pointless conditional assignment in SunOS section
18595 abspath.c: move declaration of 'len' into inner block and use appropriate type
18596 commit.c: rename variable named 'n' which masks previous declaration
18597 t/test-lib.sh: provide a shell implementation of the 'yes' utility
18599 Brian Gianforcaro (1):
18600 Style fixes, add a space after if/for/while.
18602 Christian Couder (13):
18603 refs: add a "for_each_replace_ref" function
18604 replace_object: add mechanism to replace objects found in "refs/replace/"
18605 sha1_file: add a "read_sha1_file_repl" function
18606 object: call "check_sha1_signature" with the replacement sha1
18607 replace_object: add a test case
18608 mktag: call "check_sha1_signature" with the replacement sha1
18609 environment: add global variable to disable replacement
18610 Add new "git replace" command
18611 builtin-replace: teach "git replace" to actually replace
18612 parse-options: add new function "usage_msg_opt"
18613 builtin-replace: use "usage_msg_opt" to give better error messages
18614 Documentation: add documentation for "git replace"
18615 t6050: check pushing something based on a replaced commit
18618 Add git-replace to .gitignore
18621 git.el: Clarify documentation of git-commit-tree
18623 David Soria Parra (1):
18624 run-command.c: squelch a "use before assignment" warning
18627 git-cvsimport: add support for cvs pserver password scrambling.
18630 svn: initial "master" points to trunk if possible
18631 svn: (cleanup) use predefined constant for rev_map_fmt
18632 svn: assume URLs from the command-line are URI-encoded
18634 Geoffrey Irving (1):
18635 git fast-export: add --no-data option
18637 Giuseppe Bilotta (3):
18638 gitweb: fix 'Use of uninitialized value' error in href()
18639 git apply: option to ignore whitespace differences
18640 gitweb: pull ref markes pull out of subject <a> element
18643 cvsimport: add test illustrating a bug in cvsps
18644 cvsimport: extend testcase about patchset order to contain branches
18646 Jakub Narębski (6):
18647 gitweb: Make .error style generic
18648 gitweb: Mark boundary commits in 'blame' view
18649 gitweb: Use "previous" header of git-blame -p in 'blame' view
18650 gitweb: Mark commits with no "previous" in 'blame' view
18651 gitweb: Add author initials in 'blame' view, a la "git gui blame"
18652 gitweb: Use light/dark for class names also in 'blame' view
18655 git-tag(1): Refer to git-check-ref-format(1) for <name>
18658 push: add --quiet flag
18659 transport: pass "quiet" flag to pack-objects
18660 transport: don't show push status if --quiet is given
18661 tests: use "$TEST_DIRECTORY" instead of ".."
18662 tests: provide $TRASH_DIRECTORY variable
18663 tests: allow user to specify trash directory location
18664 t/Makefile: include config.mak
18665 allow pull --rebase on branch yet to be born
18666 tests: disable interactive hunk selection tests if perl is not available
18667 clone: add --branch option to select a different HEAD
18668 refactor test-date interface
18669 tests: add date printing and parsing tests
18670 fix approxidate parsing of relative months and years
18671 push: teach --quiet to suppress "Everything up-to-date"
18674 Check return value of ftruncate call in http.c
18677 git submodule summary: add --files option
18680 git submodule foreach: Provide access to submodule name, as '$name'
18681 git submodule: Cleanup usage string and add option parsing to cmd_foreach()
18682 Add selftest for 'git submodule foreach'
18683 git submodule foreach: test access to submodule name as '$name'
18684 git submodule foreach: Add --recursive to recurse into nested submodules
18685 git submodule update: Introduce --recursive to update nested submodules
18686 git submodule status: Add --recursive to recurse into nested submodules
18687 t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
18688 git clone: Add --recursive to automatically checkout (nested) submodules
18690 Johannes Schindelin (2):
18691 Make 'git stash -k' a short form for 'git stash save --keep-index'
18692 parse-opt: optionally show "--no-" option string
18694 Johannes Sixt (13):
18695 MinGW: simplify waitpid() emulation macros
18696 run_command: return exit code as positive value
18697 run_command: report system call errors instead of returning error codes
18698 run_command: encode deadly signal number in the return value
18699 run_command: report failure to execute the program, but optionally don't
18700 receive-pack: remove unnecessary run_status report
18701 api-run-command.txt: describe error behavior of run_command functions
18702 t0001-init: fix a file name
18703 t0001-init: split the existence test from the permission test
18704 gitk: Do not hard-code "encoding" in attribute lookup functions
18705 Make test number t7406- unique
18706 Make test case number unique
18707 status: list unmerged files much later
18709 Junio C Hamano (31):
18710 t/t9600: remove exit after test_done
18712 request-pull: optionally show a patch as well
18713 diff-index: report unmerged new entries
18714 diff-index: keep the original index intact
18715 Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
18716 wt-status.c: rework the way changes to the index and work tree are summarized
18717 git-rev-list.txt: Clarify the use of multiple revision arguments
18718 block-sha1: undo ctx->size change
18719 block-sha1: minor fixups
18720 am: allow individual e-mail files as input
18721 status: show worktree status of conflicted paths separately
18722 verify-pack --stat-only: show histogram without verifying
18724 wt-status: move many global settings to wt_status structure
18725 wt-status: move wt_status_colors[] into wt_status structure
18726 Make git_status_config() file scope static to builtin-commit.c
18727 wt-status: collect untracked files in a separate "collect" phase
18728 Documentation/git-commit.txt: describe --dry-run
18729 git commit --dry-run -v: show diff in color when asked
18730 compat/snprintf.c: clarify SNPRINTF_SIZE_CORR
18731 builtin-mailinfo.c: fix confusing internal API to mailinfo()
18732 Teach mailinfo to ignore everything before -- >8 -- mark
18733 am/mailinfo: Disable scissors processing by default
18734 mailinfo.scissors: new configuration
18735 Draft release notes to 1.6.5 before -rc0
18736 upload-pack: add a trigger for post-upload-pack hook
18737 upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
18738 builtin-pack-objects.c: avoid vla
18739 builtin-apply.c: get rid of an unnecessary use of temporary array
18743 git-svn: Use GIT_SSH setting if SVN_SSH is not set
18746 Documentaqtion/git-submodule.txt: Typofix
18747 git-log: allow --decorate[=short|full]
18749 Linus Torvalds (12):
18750 Add new optimized C 'block-sha1' routines
18751 block-sha1: try to use rol/ror appropriately
18752 block-sha1: make the 'ntohl()' part of the first SHA1 loop
18753 block-sha1: re-use the temporary array as we calculate the SHA1
18754 block-sha1: macroize the rounds a bit further
18755 block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in round 3
18756 block-sha1: get rid of redundant 'lenW' context
18757 block-sha1: perform register rotation using cpp
18758 block-sha1: improved SHA1 hashing
18759 block-sha1: improve code on large-register-set machines
18760 Improve on 'approxidate'
18761 Further 'approxidate' improvements
18764 git-p4: stream from perforce to speed up clones
18767 gitweb: support to globally disable a snapshot format
18768 gitweb: update INSTALL regarding specific snapshot settings
18769 gitweb: add support for XZ compressed snapshots
18770 gitweb: improve snapshot error handling
18771 gitweb: split test suite into library and tests
18772 gitweb: add t9501 tests for checking HTTP status codes
18775 rebase: consistent error messages for staged and unstaged changes.
18776 git-ls-files.txt: clarify what "other files" mean for --other
18777 Show usage string for 'git log -h', 'git show -h' and 'git diff -h'
18778 Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
18779 reset: make the reminder output consistent with "checkout"
18780 stash: simplify defaulting to "save" and reject unknown options
18782 Michael Haggerty (6):
18783 Start a library for cvsimport-related tests
18784 Use CVS's -f option if available (ignore user's ~/.cvsrc file)
18785 Test contents of entire cvsimported "master" tree contents
18786 Add some tests of git-cvsimport's handling of vendor branches
18787 Add a test of "git cvsimport"'s handling of tags and branches
18788 git-svn: ignore leading blank lines in svn:ignore
18790 Michael J Gruber (3):
18791 t6010-merge-base.sh: Depict the octopus test graph
18792 git-merge-base/git-show-branch: Cleanup documentation and usage
18793 git-merge-base/git-show-branch --merge-base: Documentation and test
18795 Michał Kiedrowicz (2):
18796 init-db: migrate to parse-options
18797 grep: Add --max-depth option.
18799 Nanako Shiraishi (3):
18800 git init: optionally allow a directory argument
18801 Documentation: consistently refer to check-ref-format
18802 Documentation: describe the scissors mark support of "git am"
18804 Nguyễn Thái Ngọc Duy (1):
18805 Prevent diff machinery from examining assume-unchanged entries on worktree
18808 Shift object enumeration out of upload-pack
18810 Nicolas Pitre (11):
18811 block-sha1: move code around
18812 block-sha1: split the different "hacks" to be individually selected
18813 block-sha1: support for architectures with memory alignment restrictions
18814 block-sha1: more good unaligned memory access candidates
18815 block-sha1: make the size member first in the context struct
18816 make sure byte swapping is optimal for git
18817 block-sha1: guard gcc extensions with __GNUC__
18818 remove ARM and Mozilla SHA1 implementations
18819 fix simple deepening of a repo
18820 make shallow repository deepening more network efficient
18821 pack-objects: free preferred base memory after usage
18823 Nicolas Sebrecht (1):
18824 git-am: print fair error message when format detection fails
18827 git stash: Give friendlier errors when there is nothing to apply
18830 Do not scramble password read from .cvspass
18833 update-server-info: make builtin, use parseopt
18834 UI consistency: allow --force for where -f means force
18837 read-tree: convert unhelpful usage()'s to helpful die()'s
18838 read-tree: migrate to parse-options
18839 write-tree: migrate to parse-options
18840 verify-tag: migrate to parse-options
18841 verify-pack: migrate to parse-options
18842 prune-packed: migrate to parse-options
18843 technical-docs: document tree-walking API
18846 http.c: free preq when aborting
18847 http.c: replace usage of temporary variable for urls
18849 Thadeu Lima de Souza Cascardo (1):
18850 Translate the tutorial to Brazillian Portuguese
18853 Document 'stash clear' recovery via unreachable commits
18854 gitk: New option to hide remote refs
18855 gitk: Fix direction of symmetric difference in optimized mode
18856 gitk: Parse arbitrary commit-ish in SHA1 field
18857 git-apply--interactive: Refactor patch mode code
18858 Add a small patch-mode testing library
18859 builtin-add: refactor the meat of interactive_add()
18860 Implement 'git reset --patch'
18861 Implement 'git checkout --patch'
18862 Implement 'git stash save --patch'
18863 DWIM 'git stash save -p' for 'git stash -p'
18865 Tuomas Suutari (1):
18866 git-svn.txt: Fix location of parent argument
18868 Wesley J. Landaker (2):
18869 Documentation: git-send-email: fix submission port number
18870 Documentation: git-send-email: correct statement about standard ports
18873 Add support for the Mongoose web server.
18876 Version v1.6.4.5; changes since v1.6.4.4:
18877 -----------------------------------------
18879 Andreas Gruenbacher (3):
18880 base85 debug code: Fix length byte calculation
18881 base85: encode_85() does not use the decode table
18882 base85: Make the code more obvious instead of explaining the non-obvious
18884 Andreas Schwab (1):
18885 git count-objects: handle packs bigger than 4G
18888 ls-files: die instead of fprintf/exit in -i error
18891 help -i: properly error out if no info viewer can be found
18894 Check size of path buffer before writing into it
18897 commit: --cleanup is a message option
18899 Jakub Narębski (1):
18900 gitweb: Introduce esc_attr to escape attributes of HTML elements
18903 rebase -i: more graceful handling of invalid commands
18906 ls-files: excludes should not impact tracked files
18907 textconv: stop leaking file descriptors
18909 Jonathan Nieder (1):
18910 Documentation: describe check-ref-format --branch
18912 Junio C Hamano (5):
18913 show-branch: fix segfault when showbranch.default exists
18914 fast-import.c::validate_raw_date(): really validate the value
18915 checkout -m: do not try to fall back to --merge from an unborn branch
18916 Fix mis-backport of t7002
18920 grep: do not segfault when -f is used
18923 push: Correctly initialize nonfastforward in transport_push.
18924 branch: die explicitly why when calling "git branch [-a|-r] branchname".
18927 git-stash documentation: mention default options for 'list'
18929 Nguyễn Thái Ngọc Duy (1):
18930 t7102: make the test fail if one of its check fails
18932 Uwe Kleine-König (1):
18933 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
18936 Version v1.6.4.4; changes since v1.6.4.3:
18937 -----------------------------------------
18940 checkout: do not imply "-f" on unborn branches
18942 Junio C Hamano (6):
18943 Fix "unpack-objects --strict"
18944 check_path(): allow symlinked directories to checkout-index --prefix
18945 xutils: Fix hashing an incomplete line with whitespaces at the end
18946 xutils: Fix xdl_recmatch() on incomplete lines
18947 http.c: avoid freeing an uninitialized pointer
18951 Version v1.6.4.3; changes since v1.6.4.2:
18952 -----------------------------------------
18955 githooks.txt: put hooks into subsections
18957 Clemens Buchacher (2):
18958 grep: fix exit status if external_grep() punts
18959 grep: accept relative paths outside current working directory
18961 Emmanuel Trillaud (1):
18962 git-pull: do not mention --quiet and --verbose twice
18965 git-cvsserver: no longer use deprecated 'git-subcommand' commands
18968 clone: disconnect transport after fetching
18969 push: fix english in non-fast-forward message
18970 push: re-flow non-fast-forward message
18972 Junio C Hamano (1):
18976 svn: properly escape arguments for authors-prog
18979 git-clone: add missing comma in --reference documentation
18982 http.c: remove verification of remote packs
18985 Version v1.6.4.2; changes since v1.6.4.1:
18986 -----------------------------------------
18989 Minor improvement to the write-tree documentation
18992 Round-down years in "years+months" relative date view
18995 add tests for merge message headings
18996 merge: fix incorrect merge message for ambiguous tag/branch
18997 merge: indicate remote tracking branches in merge message
18999 Johannes Schindelin (2):
19000 Expose the has_non_ascii() function
19001 Correctly mark cover letters' encodings if they are not pure ASCII
19004 t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
19006 Junio C Hamano (3):
19007 apply: notice creation/removal patches produced by GNU diff
19008 clean: require double -f options to nuke nested git repository and work tree
19011 Kirill Smelkov (1):
19012 git add -p: demonstrate failure when staging both mode and hunk
19015 lstat_cache: guard against full match of length of 'name' parameter
19018 git-log: allow --decorate[=short|full]
19020 Linus Torvalds (1):
19021 git-checkout: be careful about untracked symlinks
19023 Nanako Shiraishi (3):
19024 git-bisect: call the found commit "*the* first bad commit"
19025 Fix overridable written with an extra 'e'
19026 Remove unused t/t8005/iso8859-5.txt
19028 Pickens, James E (1):
19029 Demonstrate bugs when a directory is replaced with a symlink
19032 http.c: don't assume that urls don't end with slash
19033 http.c: set slot callback members to NULL when releasing object
19036 add -p: do not attempt to coalesce mode changes
19038 Wesley J. Landaker (1):
19039 Documentation: git-archive: mark --format as optional in summary
19042 Version v1.6.4.1; changes since v1.6.4:
19043 ---------------------------------------
19045 Björn Steinbrink (1):
19046 config: Keep inner whitespace verbatim
19048 Erik Faye-Lund (1):
19049 send-email: remove debug trace
19051 Jakub Narębski (1):
19052 gitweb/README: Document $base_url
19055 show: suppress extra newline when showing annotated tag
19056 show: add space between multiple items
19057 docs: describe impact of repack on "clone -s"
19060 Documentation: git submodule: add missing options to synopsis
19063 help.c: give correct structure's size to memset()
19065 Johannes Schindelin (1):
19066 filter-branch: add an example how to add ACKs to a range of commits
19068 Junio C Hamano (5):
19069 merge-recursive: don't segfault while handling rename clashes
19070 t5510: harden the way verify-pack is used
19071 verify-pack -v: do not report "chain length 0"
19072 am: allow individual e-mail files as input
19076 git-instaweb: fix mod_perl detection for apache2
19079 Better usage string for reflog.
19080 push: point to 'git pull' and 'git push --force' in case of non-fast forward
19081 filter-branch: make the usage string fit on 80 chars terminals.
19084 hg-to-git: don't import the unused popen2 module
19087 don't let the delta cache grow unbounded in 'git repack'
19089 Nicolas Sebrecht (1):
19090 git-am: print fair error message when format detection fails
19093 Change mentions of "git programs" to "git commands"
19096 Documentation: merge: one <remote> is required
19097 Documentation: add: <filepattern>... is optional
19100 t5520-pull: Test for rebased upstream + fetch + pull --rebase
19101 pull: support rebased upstream + fetch + pull --rebase
19104 gitweb: parse_commit_text encoding fix
19107 Fix typos in git-remote.txt and git-symbolic-ref.txt
19110 Version v1.6.4; changes since v1.6.4-rc3:
19111 -----------------------------------------
19114 Update the documentation of the raw diff output format
19117 fast-export: Set revs.topo_order before calling setup_revisions
19118 fast-export: Omit tags that tag trees
19119 fast-export: Make sure we show actual ref names instead of "(null)"
19120 fast-export: Do parent rewriting to avoid dropping relevant commits
19121 fast-export: Add a --tag-of-filtered-object option for newly dangling tags
19122 Add new fast-export testcases
19123 fast-export: Document the fact that git-rev-list arguments are accepted
19126 t9143: do not fail if Compress::Zlib is missing
19129 Fix rebase -p --onto
19131 Junio C Hamano (2):
19135 Michael J Gruber (1):
19136 git-rerere.txt: Clarify ambiguity of the config variable
19138 Sean Estabrooks (1):
19139 Trivial path quoting fixes in git-instaweb
19142 config.txt: document add.ignore-errors
19145 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
19148 Version v1.6.4-rc3; changes since v1.6.4-rc2:
19149 ---------------------------------------------
19152 Make section_name_match start on '[', and return the length on success
19153 After renaming a section, print any trailing variable definitions
19155 Björn Steinbrink (1):
19156 Add a test showing that 'git repack' throws away grafted-away parents
19158 Daniel Trstenjak (1):
19159 Show the presence of untracked files in the bash prompt.
19162 git svn: fix shallow clone when upstream revision is too new
19163 git svn: revert default behavior for --minimize-url
19164 git svn: the branch command no longer needs the full path
19165 t9142: stop httpd after the test
19166 git svn: avoid escaping '/' when renaming/copying files
19167 git svn: make minimize URL more reliable over http(s)
19170 send-email: detect cycles in alias expansion
19172 Johannes Schindelin (1):
19173 git repack: keep commits hidden by a graft
19175 Junio C Hamano (6):
19176 do_one_ref(): null_sha1 check is not about broken ref
19177 SunOS grep does not understand -C<n> nor -e
19178 Update release notes for 1.6.4
19179 Fix severe breakage in "git-apply --whitespace=fix"
19180 t8005: Nobody writes Russian in shift_jis
19183 Linus Torvalds (3):
19184 git branch: fix performance problem
19185 git branch: avoid unnecessary object lookups
19186 git branch: clean up detached branch handling
19188 Matthias Andree (1):
19189 Fix export_marks() error handling.
19191 Nanako Shiraishi (1):
19192 Documentation/config.txt: a variable can be defined on the section header line
19195 git svn: add gc command
19198 Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
19201 Version v1.6.4-rc2; changes since v1.6.4-rc1:
19202 ---------------------------------------------
19205 refs.c: release file descriptor on error return
19206 sha1_name.c: avoid unnecessary strbuf_release
19207 configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
19208 configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
19211 git svn: rename tests that had conflicting numbers
19212 git svn: fix reparenting when ugly http(s) URLs are used
19214 Junio C Hamano (5):
19215 checkout -f: deal with a D/F conflict entry correctly
19216 push: do not give big warning when no preference is configured
19217 Updates to draft release notes to 1.6.4
19218 combine-diff.c: fix performance problem when folding common deleted lines
19219 diff --cc: a lost line at the beginning of the file is shown incorrectly
19221 Martin Koegler (1):
19222 git stash: modernize use of "dashed" git-XXX calls
19224 Michael J Gruber (1):
19225 t4202-log.sh: Test git log --no-walk sort order
19228 cvsexportcommit: reorder tests to quiet intermittent failure
19230 Pierre Habouzit (4):
19231 janitor: use NULL and not 0 for pointers.
19232 refactor: use bitsizeof() instead of 8 * sizeof()
19233 janitor: add DIV_ROUND_UP and use it.
19234 janitor: useless checks before free
19237 Trailing whitespace and no newline fix
19240 List send-email config options in config.txt.
19241 Improve doc for format-patch threading options.
19244 Version v1.6.4-rc1; changes since v1.6.4-rc0:
19245 ---------------------------------------------
19247 Andreas Ericsson (1):
19248 mailinfo: Remove only one set of square brackets
19251 unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5
19252 git-compat-util.h: adjust for SGI IRIX 6.5
19253 Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments
19254 Makefile: add section for SGI IRIX 6.5
19255 Makefile: update IRIX64 section
19258 git svn: allow uppercase UUIDs from SVN
19261 quickfetch(): Prevent overflow of the rev-list command line
19263 Junio C Hamano (2):
19264 Makefile: keep "git" when bindir is execdir
19265 Revert "mailinfo: Remove only one set of square brackets"
19267 Linus Torvalds (10):
19268 Add 'fill_directory()' helper function for directory traversal
19269 Simplify read_directory[_recursive]() arguments
19270 Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry
19271 Avoid using 'lstat()' to figure out directories
19272 Prepare symlink caching for thread-safety
19273 Export thread-safe version of 'has_symlink_leading_path()'
19274 Make index preloading check the whole path to the file
19275 Make 'git show' more useful
19276 Improve on the 'invalid object' error message at commit time
19277 Fix extraneous lstat's in 'git checkout -f'
19279 Mattias Nissler (2):
19280 git-svn: Always duplicate paths returned from get_log
19281 git-svn: Fix branch detection when repository root is inaccessible
19284 Document 'git (rev-list|log) --merges'
19285 bash: add '--merges' to common 'git log' options
19287 Wincent Colaiuta (1):
19288 gitweb: update Git homepage URL
19291 Version v1.6.4-rc0; changes since v1.6.3.4:
19292 -------------------------------------------
19295 Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
19298 Quote LF in urls git fetch saves in FETCH_HEAD
19299 Use UTF-8 instead of utf8 for backward compatibility
19300 Improve the naming of guessed target repository for git clone
19303 git-svn: Fix for svn paths removed > log-window-size revisions ago
19304 git-svn: Correctly report max revision when following deleted paths
19305 git-svn: Set svn.authorsfile if it is passed to git svn clone
19308 graph API: Use horizontal lines for more compact graphs
19310 Andreas Ericsson (1):
19311 fetch: Strip usernames from url's before storing them
19314 Add 'git svn help [cmd]' which works outside a repo.
19315 git-svn: speed up find_rev_before
19316 Add 'git svn reset' to unwind 'git svn fetch'
19318 Benjamin Kramer (1):
19319 imap-send: add support for IPv6
19322 builtin-remote: (get_one_entry): use strbuf
19324 Björn Steinbrink (1):
19325 git-apply(1): Clarify that one can select where to apply the patch
19327 Brandon Casey (23):
19328 t3900: use ancient iconv names for backward compatibility
19329 Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
19330 builtin-mailinfo.c: compare character encodings case insensitively
19331 builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encoding
19332 t3901: avoid negation on right hand side of '|'
19333 t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
19334 t9301: use ISO8859-1 rather than ISO-8859-1
19335 t5100: use ancient encoding syntax for backwards compatibility
19336 t8005: use more portable character encoding names
19337 t8005: convert CP1251 character set to ISO8859-5
19338 t8005: fix typo, it's ISO-8859-5, not KOI8-R
19339 Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
19340 Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments
19341 On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
19342 git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
19343 Makefile: define __sun__ on SunOS
19344 Makefile: add section for SunOS 5.7
19345 git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
19346 git-send-email.perl: improve detection of MIME encoded-words
19347 send-email: use UTF-8 rather than utf-8 for consistency
19348 Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
19349 t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH
19350 git.c: avoid allocating one-too-many elements for new argv array
19352 Christian Couder (30):
19353 rev-list: make "estimate_bisect_steps" non static
19354 rev-list: refactor printing bisect vars
19355 bisect: move common bisect functionality to "bisect_common"
19356 bisect--helper: add "--next-exit" to output bisect results
19357 bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
19358 bisect--helper: remove "--next-vars" option as it is now useless
19359 rev-list: remove stringed output flag from "show_bisect_vars"
19360 rev-parse: add --sq-quote to shell quote arguments
19361 bisect: use "git rev-parse --sq-quote" instead of a custom "sq" function
19362 am: simplify "sq" function by using "git rev-parse --sq-quote"
19363 bisect: use "sha1_array" to store skipped revisions
19364 bisect: implement "rev_argv_push" to fill an argv with revs
19365 bisect: store good revisions in a "sha1_array"
19366 bisect: use new "struct argv_array" to prepare argv for "setup_revisions"
19367 bisect: remove too much function nesting
19368 bisect: make skipped array functions more generic
19369 bisect: automatically sort sha1_array if needed when looking it up
19370 bisect: implement the "check_merge_bases" function
19371 bisect: add "check_good_are_ancestors_of_bad" function
19372 bisect: make "git bisect" use new "--next-all" bisect-helper function
19373 bisect: rework some rev related functions to make them more reusable
19374 commit: add function to unparse a commit and its parents
19375 bisect: check ancestors without forking a "git rev-list" process
19376 bisect: drop unparse_commit() and use clear_commit_marks()
19377 bisect: display first bad commit without forking a new process
19378 bisect: add parameters to "filter_skipped"
19379 bisect: when skipping, choose a commit away from a skipped commit
19380 t6030: test skipping away from an already skipped commit
19381 bisect: use a PRNG with a bias when skipping away from untestable commits
19382 Documentation: remove warning saying that "git bisect skip" may slow bisection
19384 Christian Stimming (1):
19385 gitk: Update German translation.
19387 Clemens Buchacher (5):
19388 http-push: reuse existing is_null_ref
19389 match_refs: search ref list tail internally
19390 test-lib: fail if invalid options are passed
19391 test-lib: allow exit trap to be used for cleanup by tests
19392 test-lib: fix http exit codes
19395 Unify signedness in hashing calls
19397 Daniel Trstenjak (1):
19398 Show presence of stashed changes in bash prompt.
19401 mergetool--lib: specialize diff options for emerge and ecmerge
19402 mergetool--lib: add support for araxis merge
19403 compat: add a mkstemps() compatibility function
19404 compat: add a basename() compatibility function
19405 diff: generate pretty filenames in prep_temp_blob()
19407 Dirk Süsserott (1):
19408 gitk: Add option 'Simple history' to the options menu
19410 Edward Z. Yang (1):
19411 connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
19414 gitk: Make more options easily accessible from Edit View dialog
19416 Eric W. Biederman (1):
19417 git-send-email: Handle quotes when parsing .mailrc files
19420 git-svn: refuse to dcommit non-UTF-8 messages
19421 git-svn: convert globs to regexps for branch destinations
19422 t9138: remove stray dot in test which broke bash
19423 Allow the Unix epoch to be a valid commit date
19425 Eygene Ryabinkin (1):
19426 git-svn testsuite: use standard configuration for Subversion tools
19428 Felipe Contreras (2):
19429 Change prettify_ref to prettify_refname
19430 Prettify log decorations even more
19432 Frank Lichtenheld (2):
19433 Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
19434 Git.pm: Always set Repository to absolute path if autodetecting
19436 Giuseppe Bilotta (11):
19437 git-am foreign patch support: introduce patch_format
19438 git-am foreign patch support: autodetect some patch formats
19439 git-am foreign patch support: StGIT support
19440 git-am: refactor 'cleaning up and aborting'
19441 gitweb: refactor author name insertion
19442 gitweb: uniform author info for commit and commitdiff
19443 gitweb: use git_print_authorship_rows in 'tag' view too
19444 gitweb: (gr)avatar support
19445 gitweb: gravatar url cache
19446 gitweb: picon avatar provider
19447 gitweb: add empty alt text to avatar img
19450 Extend sample update hook, disable modifying of existing tags
19451 Extend sample pre-commit hook to check for non ascii filenames
19453 Hunter, D. Seth (1):
19454 http-push: fix xml_entities() string parsing overrun
19456 Jakub Narębski (10):
19457 gitweb: Remove function prototypes (cleanup)
19458 gitweb: Do not use bareword filehandles
19459 gitweb: Always use three argument form of open
19460 gitweb: Always use three argument form of open
19461 gitweb: Use block form of map/grep in a few cases more
19462 gitweb: Replace wrongly added tabs with spaces
19463 gitweb: Use capturing parentheses only when you intend to capture
19464 gitweb: Simplify snapshot format detection logic in evaluate_path_info
19465 gitweb: Remove unused $hash_base parameter from normalize_link_target
19466 gitweb: Sanitize title attribute in format_subject_html
19469 parseopt: add OPT_NEGBIT
19470 convert bare readlink to strbuf_readlink
19471 git-add: no need for -f when resolving a conflict in already tracked path
19472 Makefile: refactor regex compat support
19473 Makefile: use compat regex on Solaris
19474 log-tree: fix confusing comment
19475 Makefile: install 'git' in execdir
19478 post-receive-email: hooks.showrev: show how to include both web link and patch
19479 avoid NULL dereference on failed malloc
19482 Rename submodule.<name>.rebase to submodule.<name>.update
19483 git-submodule: add support for --merge.
19485 Johannes Schindelin (12):
19486 git-add: introduce --edit (to edit the diff vs. the index)
19487 t3702: fix reliance on SHELL_PATH being '/bin/sh'
19488 MinGW: the path separator to split GITPERLLIB is ';' on Win32
19489 MinGW: use POSIX signature of waitpid()
19490 MinGW: Add a simple getpass()
19491 MinGW: Fix compiler warning in merge-recursive
19492 MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
19493 Quiet make: do not leave Windows behind
19494 Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
19495 test-chmtime: work around Windows limitation
19496 MinGW: fix warning about implicit declaration of _getch()
19497 Fix warnings in nedmalloc when compiling with GCC 4.4.0
19499 Johannes Sixt (10):
19500 gitk: Use --textconv to generate diff text
19501 Simplify some instances of run_command() by using run_command_v_opt().
19502 Simplify some 'fprintf(stderr); return -1;' by using 'return error()'
19503 Fix typo in nedmalloc warning fix
19504 compat/ has subdirectories: do not omit them in 'make clean'
19505 daemon: send stderr of service programs to the syslog
19506 upload-pack: squelch progress indicator if client cannot see it
19507 receive-pack: do not send error details to the client
19508 git-mv: fix directory separator treatment on Windows
19509 MinGW: truncate exit()'s argument to lowest 8 bits
19512 mktree --missing: updated usage message and man page
19513 mktree --batch: build more than one tree object
19514 mktree: validate entry type in input
19516 Junio C Hamano (22):
19517 Start 1.6.4 development
19518 build-in git-mktree
19519 mktree: use parse-options
19520 builtin-mktree.c: use a helper function to handle one line of input
19521 mktree: do not barf on a submodule commit
19522 t1010: add mktree test
19523 mktree --missing: allow missing objects
19524 t3900: ISO-2022-JP has more than one popular variants
19525 write-tree --ignore-cache-tree
19526 Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
19527 OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
19528 cache-tree.c::cache_tree_find(): simplify internal API
19529 t4007: modernize the style
19530 Optimize "diff-index --cached" using cache-tree
19531 Avoid "diff-index --cached" optimization under --find-copies-harder
19532 Update draft release notes to 1.6.4
19533 completion: fix PS1 display during an AM on detached HEAD
19534 Documentation/git.txt: update links to release notes
19535 Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH
19536 Makefile: test-parse-options depends on parse-options.h
19537 Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
19538 die_errno(): double % in strerror() output just in case
19541 symlinks.c: small style cleanup
19544 add --porcelain option to git-push
19546 Linus Torvalds (3):
19547 Clean up and simplify rev_compare_tree()
19548 Fix various sparse warnings in the git source code
19549 git log: add '--merges' flag to match '--no-merges'
19551 Marc Branchaud (3):
19552 git svn: Support multiple branch and tag paths in the svn repository.
19553 git svn: cleanup t9138-multiple-branches
19554 git svn: Doc update for multiple branch and tag paths
19556 Marius Storm-Olsen (2):
19557 MinGW readdir reimplementation to support d_type
19558 Add custom memory allocator to MinGW and MacOS builds
19561 git-svn: add --authors-prog option
19562 http.c: prompt for SSL client certificate password
19563 http.c: add http.sslCertPasswordProtected option
19565 Markus Heidelberg (10):
19566 show-branch: color the commit status signs
19567 bash completion: show-branch color support
19568 diff: do not color --stat output like patch context
19569 gitk: Allow diff view without context lines
19570 add a test for git-send-email for non-threaded mails
19571 send-email: fix non-threaded mails
19572 doc/send-email: clarify the behavior of --in-reply-to with --no-thread
19573 add a test for git-send-email for threaded mails without chain-reply-to
19574 send-email: fix threaded mails without chain-reply-to
19575 send-email: fix a typo in a comment
19578 Remove filename from conflict markers
19580 Michael J Gruber (9):
19581 Documentation: clarify / requirement in 'git check-ref-format'
19582 Test tracking of non-commit upstreams
19583 Fix behavior with non-commit upstream references
19584 Allow push and fetch urls to be different
19585 t5516: Check pushurl config setting
19586 technical/api-remote: Describe new struct remote member pushurl
19587 git-repack.txt: Clarify implications of -a for dumb protocols
19588 builtin-remote: Show push urls as well
19589 builtin-remote: Make "remote -v" display push urls
19591 Michael S. Tsirkin (1):
19592 Add --reference option to git submodule.
19594 Michael Witten (6):
19595 Docs: send-email: Put options back into alphabetical order
19596 Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
19597 Docs: send-email: --smtp-server-port can take symbolic ports
19598 send-email: Handle "GIT:" rather than "GIT: " during --compose
19599 send-email: 'References:' should only reference what is sent
19600 send-email: Remove superfluous `my $editor = ...'
19603 apply: handle filenames with double slashes better
19605 Michele Ballabio (1):
19606 gitk: Add another string to translation
19609 Don't expect verify_pack() callers to set pack_size
19610 transport.c::get_refs_via_curl(): do not leak refs_url
19611 http.c: new functions for the http API
19612 transport.c::get_refs_via_curl(): use the new http API
19613 http.c::http_fetch_ref(): use the new http API
19614 http-push.c::remote_exists(): use the new http API
19615 http-push.c::fetch_symref(): use the new http API
19617 Nguyễn Thái Ngọc Duy (3):
19618 doc/git-rebase.txt: remove mention of multiple strategies
19619 Terminate argv with NULL before calling setup_revisions()
19620 t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
19623 diff-tree -r -t: include added/removed directories in the output
19626 git-cvsexportcommit can't commit files which have been removed from CVS
19627 Remove archaic use of regex capture \1 in favour of $1
19628 Avoid generating a warning if $fullname{$file} is undefined
19631 Test cccmd in t9001-send-email.sh and fix some bugs
19634 gitk: Handle msysGit version during version comparisons
19635 git: browsing paths with spaces when using the start command
19637 Paul Mackerras (1):
19638 gitk: Check git version before using --textconv flag
19641 MinGW: Scan for \r in addition to \n when reading shbang lines
19643 Peter Hutterer (1):
19644 git-submodule: add support for --rebase.
19646 Pierre Habouzit (1):
19647 parse-options: add parse_options_check to validate option specs.
19649 Ralf Wildenhues (1):
19650 configure: test whether -lresolv is needed
19653 parseopt: add OPT_NEGBIT
19654 parseopt: add OPT_NUMBER_CALLBACK
19655 parseopt: add PARSE_OPT_NODASH
19656 grep: remove global variable builtin_grep
19658 grep: make callback functions static
19659 userdiff: add xdiff_clear_find_func()
19660 grep: move context hunk mark handling into show_line()
19661 grep: print context hunk marks between files
19662 grep: handle pre context lines on demand
19663 grep: add option -p/--show-function
19664 grep -p: support user defined regular expressions
19665 grep: simplify -p output
19667 Robin Rosenberg (1):
19668 Disallow '\' in ref names
19671 bash: remove always true if statement from __git_ps1()
19672 Documentation: mention 'git stash pop --index' option explicitly
19673 bash: add support for 'git stash pop --index' option
19676 parse-remote: function to get the tracking branch to be merge
19677 parse-remote: support default reflist in get_remote_merge_branch
19678 parse-remote: remove unused functions
19680 Sitaram Chamarty (1):
19681 allow -t abbreviation for --track in git branch
19683 Steffen Prohaska (1):
19684 MinGW: Teach Makefile to detect msysgit and apply specific settings
19687 bash completion: complete variable names for "git config" with options
19688 format-patch: migrate to parse-options API
19689 parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
19690 show-branch: migrate to parse-options API
19691 parse-opts: prepare for OPT_FILENAME
19692 parse-opts: add OPT_FILENAME and transition builtins
19693 t5500: Modernize test style
19694 t9120: don't expect failure with SVN_HTTPD_PORT unset
19695 config.txt: document add.ignore-errors
19696 git-show-branch.txt: document --date-order option
19697 parse-options: make OPT_INTEGER's argh explicit
19698 parse-options: simplify usage argh handling
19699 show-branch: don't use LASTARG_DEFAULT with OPTARG
19700 t4150: test applying with a newline in subject
19701 am: suppress apply errors when using 3-way
19702 git-sh-setup: introduce say() for quiet options
19703 submodule, repack: migrate to git-sh-setup's say()
19704 am, rebase: teach quiet option
19705 stash: teach quiet option
19706 show-ref: migrate to parse-options
19707 completion: add missing config variables
19708 completion: __git_config_get_set_variables() handle values with spaces
19710 Tay Ray Chuan (15):
19711 t5540-http-push: test fetching of loose objects
19712 t5540-http-push: test fetching of packed objects
19713 http-push: send out fetch requests on queue
19714 http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"
19715 t5550-http-fetch: test fetching of packed objects
19716 http-push, http-walker: style fixes
19717 http-walker: verify remote packs
19718 http*: copy string returned by sha1_to_hex
19719 http-push: do not SEGV after fetching a bad pack idx file
19720 http*: move common variables and macros to http.[ch]
19721 http: create function end_url_with_slash
19722 http*: add http_get_info_packs
19723 http: use new http API in fetch_index()
19724 http*: add helper methods for fetching packs
19725 http*: add helper methods for fetching objects (loose)
19728 Documentation: teach stash/pop workflow instead of stash/apply
19729 git-svn: let 'dcommit $rev' work on $rev instead of HEAD
19730 Introduce die_errno() that appends strerror(errno) to die()
19731 Convert existing die(..., strerror(errno)) to die_errno()
19732 Use die_errno() instead of die() when checking syscalls
19734 Todd Zullinger (1):
19735 completion: Add --full-diff to log options
19738 send-email: Add config option for sender address
19741 git-svn: Canonicalize svn urls to prevent libsvn assertion
19743 Uwe Kleine-König (2):
19744 more tests for git rev-parse --parse-opt
19745 parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse
19748 git-svn.txt: stop using dash-form of commands.
19749 git-svn.txt: make formatting more consistent.
19750 git-svn.txt: fix fetch flags incorrectly documented as init flags.
19751 git-svn.txt: fix description of fetch flags accepted by clone.
19754 Version v1.6.3.4; changes since v1.6.3.3:
19755 -----------------------------------------
19758 refs.c: release file descriptor on error return
19759 sha1_name.c: avoid unnecessary strbuf_release
19762 git-remote: fix missing .uploadpack usage for show command
19764 Clemens Buchacher (1):
19765 fetch: do not create ref from empty name
19767 Giuseppe Bilotta (1):
19768 gitweb/README: fix AliasMatch in example
19771 t3700-add: add a POSIXPERM prerequisite to a new test
19772 Makefile: git.o depends on library headers
19774 Junio C Hamano (9):
19775 request-pull: really disable pager
19776 checkout -f: deal with a D/F conflict entry correctly
19777 combine-diff.c: fix performance problem when folding common deleted lines
19778 diff --cc: a lost line at the beginning of the file is shown incorrectly
19779 do_one_ref(): null_sha1 check is not about broken ref
19780 SunOS grep does not understand -C<n> nor -e
19781 Fix severe breakage in "git-apply --whitespace=fix"
19782 t8005: Nobody writes Russian in shift_jis
19785 Linus Torvalds (3):
19786 git branch: fix performance problem
19787 git branch: avoid unnecessary object lookups
19788 git branch: clean up detached branch handling
19790 Matthias Andree (1):
19791 Fix export_marks() error handling.
19794 request-pull: really really disable pager
19797 git-submodule documentation: fix foreach example
19800 attr: plug minor memory leak
19803 fread does not return negative on error
19806 Trailing whitespace and no newline fix
19808 Sitaram Chamarty (1):
19809 Documentation: update description of shell aliases
19812 add: allow configurations to be overriden by command line
19813 config.txt: document add.ignore-errors
19815 Thadeu Lima de Souza Cascardo (1):
19816 Makes some cleanup/review in gittutorial
19819 Test git archive --remote
19820 Test grep --and/--or/--not
19823 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
19826 Version v1.6.3.3; changes since v1.6.3.2:
19827 -----------------------------------------
19829 Anders Kaseorg (1):
19830 for-each-ref: Do not lookup objects when they will not be used
19832 Clemens Buchacher (1):
19833 refuse to merge during a merge
19836 use xstrdup, not strdup in ll-merge.c
19838 Johannes Schindelin (1):
19839 import-tars: support symlinks
19842 fetch-pack: close output channel after sideband demultiplexer terminates
19843 diff.c: plug a memory leak in an error path
19845 Junio C Hamano (3):
19846 t3505: fix abuse of test_expect_code
19847 attribute: whitespace set to true detects all errors known to git
19850 Linus Torvalds (1):
19851 Fix big left-shifts of unsigned char
19853 Marco Nelissen (1):
19854 fix handling of iconv configuration options
19857 http.c: fix compiling with libcurl 7.9.2
19859 Michael J Gruber (1):
19860 builtin-remote: Make "remote show" display all urls
19863 git-svn documentation: fix typo in 'rebase vs. pull/merge' section
19865 Nanako Shiraishi (1):
19866 .gitattributes: CR at the end of the line is an error
19869 Documentation: git-send-mail can take rev-list arg to drive format-patch
19870 avoid exponential regex match for java and objc function names
19873 upload-archive: fix infinite loop on Cygwin
19875 Shawn O. Pearce (1):
19876 daemon: Strictly parse the "extra arg" part of the command
19879 git-rerere.txt: grammatical fixups and cleanups
19880 pull, rebase: simplify to use die()
19881 git-show-ref.txt: remove word and make consistent
19884 http*: cleanup slot->local after fclose
19887 Documentation: refer to gitworkflows(7) from tutorial and git(1)
19889 Uwe Kleine-König (1):
19890 rebase--interactive: remote stray closing parenthesis
19893 Version v1.6.3.2; changes since v1.6.3.1:
19894 -----------------------------------------
19897 Introduce an unlink(2) wrapper which gives warning if unlink failed
19898 replace direct calls to unlink(2) with unlink_or_warn
19899 print unlink(2) errno in copy_or_link_directory
19900 Clarify kind of conflict in merge-one-file helper
19901 ls-tree manpage: use "unless" instead of "when ... is not"
19902 ls-tree manpage: output of ls-tree is compatible with update-index
19903 http-push.c::remove_locks(): fix use after free
19905 Charles Bailey (2):
19906 t6023: merge-file fails to output anything for a degenerate merge
19907 Change xdl_merge to generate output even for null merges
19909 Clemens Buchacher (1):
19910 fix segfault showing an empty remote
19913 Fix type-punning issues
19915 Daniel Cordero (1):
19916 builtin-checkout: Don't tell user that HEAD has moved before it has
19918 Dave Olszewski (1):
19919 merge-recursive: never leave index unmerged while recursing
19921 Giuseppe Bilotta (1):
19922 completion: use git rev-parse to detect bare repos
19925 fix GIT_TRACE segfault with shell-quoted aliases
19926 add: don't complain when adding empty project root
19927 for-each-ref: fix segfault in copy_email
19928 lock_ref: inform callers of unavailable ref
19929 fetch: report ref storage DF errors more accurately
19930 fix cat-file usage message and documentation
19933 format-patch let -k override a config-specified format.numbered
19934 pre-commit.sample: don't print incidental SHA1
19936 Johannes Schindelin (2):
19937 Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
19938 Cope better with a _lot_ of packs
19941 t3701: ensure correctly set up repository after skipped tests
19943 Junio C Hamano (8):
19944 Revert "git-add--interactive: remove hunk coalescing"
19945 completion: fix PS1 display during a merge on detached HEAD
19946 completion: simplify "current branch" in __git_ps1()
19947 completion: enhance "current branch" display
19948 Prepare for 1.6.3.2
19949 Update draft release notes for 1.6.3.2
19950 blame: correctly handle a path that used to be a directory
19953 Linus Torvalds (3):
19954 Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
19955 Teach 'git checkout' to preload the index contents
19956 dir.c: clean up handling of 'path' parameter in read_directory_recursive()
19959 Splitting a hunk that adds a line at the top fails in "add -p"
19961 Michael J Gruber (1):
19962 merge-options.txt: Clarify merge --squash
19964 Nanako Shiraishi (1):
19965 test: checkout shouldn't say that HEAD has moved if it didn't
19968 allow OFS_DELTA objects during a push
19971 grep: fix word-regexp colouring
19972 grep: fix word-regexp at the beginning of lines
19973 grep: fix colouring of matches with zero length
19974 grep: fix empty word-regexp matches
19977 api-parse-options.txt: use 'func' instead of 'funct'
19978 tests: Add tests for missing format-patch long options
19979 completion: add missing options to show-branch and show
19980 show-branch: Fix die message in parse_reflog_param()
19981 commit: -F overrides -t
19982 apply, fmt-merge-msg: use relative filenames
19985 Documentation: teach stash/pop workflow instead of stash/apply
19986 add -i: do not dump patch during application
19989 Turn on USE_ST_TIMESPEC for OpenBSD
19992 Version v1.6.3.1; changes since v1.6.3:
19993 ---------------------------------------
19996 Clarify kind of conflict in merge-one-file helper
19998 Alexander Potashev (1):
19999 Documentation: cloning to empty directory is allowed
20001 Felipe Contreras (1):
20002 git config: clarify --add and --get-color
20004 Junio C Hamano (4):
20005 Start 1.6.3.1 maintenance series.
20006 archive-tar.c: squelch a type mismatch warning
20007 Revert "checkout branch: prime cache-tree fully"
20011 Version v1.6.3; changes since v1.6.3-rc4:
20012 -----------------------------------------
20015 improve error message in config.c
20018 dir.c: Fix two minor grammatical errors in comments
20021 Work around BSD whose typeof(tv.tv_sec) != time_t
20024 t4018-diff-funcname: add cpp xfuncname pattern to syntax test
20025 t8005: use egrep when extended regular expressions are required
20026 t4118: add missing '&&'
20027 t4118: avoid sed invocation on file without terminating newline
20028 t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
20029 t4200: remove two unnecessary lines
20030 t4200: convert sed expression which operates on non-text file to perl
20032 Junio C Hamano (4):
20035 git-clean doc: the command only affects paths under $(cwd)
20038 Nguyễn Thái Ngọc Duy (1):
20039 t4029: use sh instead of bash
20042 honor repack.usedeltabaseoffset when fetching packs
20044 Robin H. Johnson (1):
20045 git-svn: fix a sloppy Getopt::Long usage
20048 completion: add missing configuration variables to _git_config()
20049 completion: add {gui,diff,merge}tool, man, and pager config variables
20050 completion: complete values for help.format
20051 completion: complete values for log.date
20052 completion: complete values for send-email
20053 git-am.txt: add an 'a', say what 'it' is, simplify a sentence
20054 git-am.txt: Use date or value instead of time or timestamp
20055 git-am.txt: reword extra headers in message body
20058 Version v1.6.3-rc4; changes since v1.6.3-rc3:
20059 ---------------------------------------------
20062 git-gui: Update Russian translation
20063 improve error message in config.c
20064 gitk: Add Russian translation
20066 Alexander Gavrilov (3):
20067 git-gui: Fix post-commit status with subject in non-locale encoding
20068 git-gui: Avoid an infinite rescan loop in handle_empty_diff.
20069 git-gui: Support more git version notations.
20072 builtin-merge: fix a typo in an error message
20073 Documentation: fix a grammatical error in api-builtin.txt
20075 Benjamin Kramer (1):
20076 daemon.c: fix segfault on OS X
20078 Christian Stimming (1):
20079 gitk: Mark forgotten string for translation
20081 Daniel A. Steffen (2):
20082 gitk: Fixes for Mac OS X TkAqua
20083 git-gui: Fixes for Mac OS X TkAqua
20086 Makefile: installing git in cygwin 1.7.0
20087 doc: consistently use ASCIIDOC_EXTRA
20089 Felipe Contreras (2):
20090 git config: error when editing a repo config and not being in one
20091 Fix a bunch of pointer declarations (codestyle)
20094 git-gui: Ensure consistent usage of mergetool.keepBackup
20096 Giuseppe Bilotta (1):
20097 gitk: Provide a window icon if possible
20100 Makefile: fix NO_PERL bug with gitweb
20103 git-gui: Fix merge conflict display error when filename contains spaces
20104 git-gui: When calling post-commit hook wrong variable was cleared.
20105 git-gui: run post-checkout hook on checkout
20106 git-gui: run post-checkout hook after clone
20108 Joerg Bornemann (1):
20109 git-gui: fix use of undeclared variable diff_empty_count
20111 Johannes Schindelin (2):
20112 t5701: do not get stuck in empty-push/
20113 Rename core.unreliableHardlinks to core.createObject
20116 prune-packed: advanced progress even for non-existing fan-out directories
20118 Junio C Hamano (3):
20119 diff -c -p: do not die on submodules
20120 merge-recursive: do not die on a conflicting submodule
20123 Linus Torvalds (1):
20124 grep: fix segfault when "git grep '('" is given
20127 Add semicolon to curly brace group in main Makefile
20129 Markus Heidelberg (5):
20130 git-gui: don't hide the Browse button when resizing the repo chooser
20131 git-gui: fix deleting from the context menu with empty selection
20132 git-gui: use `git --html-path` to get the location of installed HTML docs
20133 git-gui (Win): make "Explore Working Copy" more robust
20134 git-gui (Win): make starting via "Git GUI Here" on .git/ possible
20136 Michele Ballabio (2):
20137 gitk: Mark some more strings for translation
20138 gitk: Map KP_Divide to focus the search box
20141 gitk: Handle blobs containing a DOS end-of-file marker
20142 gitk: Remember and restore the window state with the geometry
20143 gitk: Handle external diff tool with spaces in the path
20144 gitk: Avoid crash if closed while reading references
20146 Patrick Welche (1):
20147 NetBSD compilation fix
20149 Paul Mackerras (4):
20150 gitk: Add a way to mark a commit, plus a "find descendant" command
20151 gitk: Add a command to compare two strings of commits
20152 gitk: Make .gitk a hidden file under windows
20153 gitk: Fix compare-commits function when we have local changes
20156 Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
20159 ctype.c: fix typo in comment
20162 git-gui: various French translation fixes
20163 git-gui: minor spelling fix and string factorisation.
20166 SubmittingPatches: itemize and reflect upon well written changes
20169 gitk: Provide a 32x32 window icon based on the git logo
20171 Uwe Kleine-König (1):
20172 parseopt: fix documentation for --keep-dashdash
20175 Version v1.6.3-rc3; changes since v1.6.3-rc2:
20176 ---------------------------------------------
20178 Benjamin Kramer (1):
20179 connect: replace inet_ntop with getnameinfo
20182 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
20183 t7700-repack: repack -a now works properly, expect success from test
20185 Johannes Schindelin (1):
20186 Add an option not to use link(src, dest) && unlink(src) when that is unreliable
20188 Linus Torvalds (1):
20192 progress bar: round to the nearest instead of truncating down
20194 Sitaram Chamarty (1):
20195 Remove obsolete bug warning in man git-update-server-info
20197 Wesley J. Landaker (2):
20198 Documentation: git-clean: fix minor grammatical errors
20199 Documentation: git-clean: make description more readable
20202 Version v1.6.3-rc2; changes since v1.6.3-rc1:
20203 ---------------------------------------------
20206 Wait for git diff to finish in git difftool
20207 Explain seemingly pointless use of system in difftool
20210 t4202-log: extend test coverage of graphing
20211 graph API: fix extra space during pre_commit_line state
20212 graph API: fix a bug in the rendering of octopus merges
20215 Work around ash "alternate value" expansion bug
20217 Bill Pemberton (1):
20218 Add parsing of elm aliases to git-send-email
20220 Dan Loewenherz (1):
20221 Convert to use quiet option when available
20223 Erik Faye-Lund (4):
20224 test-suite: adding a test for fast-export with tag variants
20225 builtin-fast-export.c: turn error into warning
20226 builtin-fast-export.c: fix crash on tagged trees
20227 builtin-fast-export.c: handle nested tags
20229 Frank Lichtenheld (1):
20230 gitcvs-migration: Link to git-cvsimport documentation
20233 gitweb: Fix snapshots requested via PATH_INFO
20236 add-interactive: refactor mode hunk handling
20237 t7800: respect NO_PERL
20240 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
20242 Johannes Schindelin (1):
20243 Fix off-by-one in read_tree_recursive
20246 Windows: Work around intermittent failures in mingw_rename
20247 Windows: Skip fstat/lstat optimization in write_entry()
20248 builtin-help: silently tolerate unknown keys
20249 remote.c: do not trigger remote.<name>.<var> codepath for two-level names
20251 Junio C Hamano (9):
20252 Speed up reflog pruning of unreachable commits
20254 read-tree A B: do not corrupt cache-tree
20255 Move prime_cache_tree() to cache-tree.c
20256 read-tree -m A B: prime cache-tree from the switched-to tree
20257 checkout branch: prime cache-tree fully
20258 Revert "stat_tracking_info(): only count real commits"
20259 Makefile: ignore perl/ subdirectory under NO_PERL
20262 Linus Torvalds (1):
20263 Clean up reflog unreachability pruning decision
20265 Markus Heidelberg (1):
20266 grep: don't support "grep.color"-like config options
20269 git add -p: new "quit" command at the prompt.
20270 Update git-add.txt according to the new possibilities of 'git add -p'.
20271 clone: add test for push on an empty clone.
20273 Michael J Gruber (2):
20274 test-lib.sh: Help test_create_repo() find the templates dir
20275 Fix more typos/spelling in comments
20277 Michał Kiedrowicz (3):
20278 tests: test applying criss-cross rename patch
20279 builtin-apply: keep information about files to be deleted
20280 tests: make test-apply-criss-cross-rename more robust
20283 builtin-remote: fix typo in option description
20284 Documentation: fix typos / spelling mistakes
20285 Fix typos / spelling in comments
20287 Nguyễn Thái Ngọc Duy (1):
20288 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
20291 test-genrandom: Add newline to usage string
20292 config.txt: add missing format.{subjectprefix,cc,attach} variables
20293 Documentation: use lowercase for shallow and deep threading
20294 git-show-branch.txt: cleanup example description
20295 git-format-patch.txt: general rewordings and cleanups
20296 config.txt: add missing 'the's and make words plural
20297 config.txt: clarify sentences in the configuration and syntax sections
20298 config.txt: Make configuration paragraph more consistent
20300 Wesley J. Landaker (2):
20301 Documentation: git-svn: fix spurious bolding that mangles the output
20302 Documentation: git-svn: fix a grammatical error without awkwardness
20304 Wincent Colaiuta (1):
20305 git add -p: add missing "q" to patch prompt
20308 Version v1.6.3-rc1; changes since v1.6.3-rc0:
20309 ---------------------------------------------
20312 graph API: Added logic for colored edges
20315 shorten_unambiguous_ref(): add strict mode
20316 for-each-ref: utilize core.warnAmbiguousRefs for :short-format
20317 rev-parse: --abbrev-ref option to shorten ref name
20319 David Aguilar (11):
20320 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
20321 difftool: remove the backup file feature
20322 difftool: use perl built-ins when testing for msys
20323 difftool: add a -y shortcut for --no-prompt
20324 difftool: move 'git-difftool' out of contrib
20325 difftool: add various git-difftool tests
20326 difftool: add support for a difftool.prompt config variable
20327 bash completion: add git-difftool
20328 mergetool: use $( ... ) instead of `backticks`
20329 difftool/mergetool: refactor commands to use git-mergetool--lib
20330 mergetool--lib: simplify API usage by removing more global variables
20333 git-shell: Add 'git-upload-archive' to allowed commands.
20336 Fix misspelled mergetool.keepBackup
20338 Frank Lichtenheld (1):
20339 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
20342 doc: clarify --no-track option
20343 doc: refer to tracking configuration as "upstream"
20344 doc/checkout: refer to git-branch(1) as appropriate
20345 doc/checkout: split checkout and branch creation in synopsis
20346 docs/checkout: clarify what "non-branch" means
20347 add-interactive: refactor mode hunk handling
20348 doc/gitattributes: clarify location of config text
20351 t1301-shared-repo: fix forced modes test
20353 Junio C Hamano (4):
20354 gitignore git-bisect--helper
20355 unpack-trees: do not muck with attributes when we are not checking out
20356 Describe fixes since 1.6.2.3
20357 Update draft release notes to 1.6.3
20359 Linus Torvalds (3):
20360 Allow users to un-configure rename detection
20361 process_{tree,blob}: show objects without buffering
20362 show_object(): push path_name() call further down
20364 Markus Heidelberg (5):
20365 doc/merge-config: list ecmerge as a built-in merge tool
20366 git-mergetool/difftool: make (g)vimdiff workable under Windows
20367 git-mergetool: add new merge tool TortoiseMerge
20368 doc/git-daemon: add missing arguments to options
20369 doc/git-daemon: add missing arguments to max-connections option
20372 git add -p: new "quit" command at the prompt.
20373 Update git-add.txt according to the new possibilities of 'git add -p'.
20375 Michael J Gruber (1):
20376 remote.c: use shorten_unambiguous_ref
20378 Michał Kiedrowicz (3):
20379 tests: test applying criss-cross rename patch
20380 builtin-apply: keep information about files to be deleted
20381 Documentation: boolean value may be given by on/off
20383 Nanako Shiraishi (1):
20384 git-am: teach git-am to apply a patch to an unborn branch
20386 Nguyễn Thái Ngọc Duy (3):
20387 get_local_heads(): do not return random pointer if there is no head
20388 attr: add GIT_ATTR_INDEX "direction"
20389 archive: do not read .gitattributes in working directory
20392 imap-send: use correct configuration variable in documentation
20394 Pierre Habouzit (1):
20395 hook/update: example of how to prevent branch creation
20398 archive tests: do not use .gitattributes in working directory
20399 archive test: attributes
20401 Sebastian Pipping (1):
20402 difftool/mergetool: add diffuse as merge and diff tool
20404 Thomas Jarosch (1):
20405 Fix buffer overflow in config parser
20408 git-apply: fix option description
20411 Version v1.6.3-rc0; changes since v1.6.2.5:
20412 -------------------------------------------
20415 disable post-checkout test on Cygwin
20416 Produce a nicer output in case of sha1_object_info failures in ls-tree -l
20417 Microoptimize strbuf_cmp
20418 Improve error message about fetch into current branch
20420 Ali Gholami Rudi (2):
20421 builtin-clone.c: make junk_pid static
20422 builtin-clone.c: no need to strdup for setenv
20425 Do not name "repo" struct "remote" in push_http.c
20426 http-push.c: use a faux remote to pass to http_init
20428 Arjen Laarhoven (2):
20429 Clean up use of ANSI color sequences
20430 builtin-branch.c: Rename branch category color names
20433 bash completion: add options for 'git fsck'
20436 git-svn: Add per-svn-remote ignore-paths config
20437 git-svn: Save init/clone --ignore-paths in config
20440 configure: ensure settings from user are also usable in the script
20441 configure: reorganize flow of argument checks
20442 configure: add macros to stash FLAG variables
20443 configure: wrap some library tests with GIT_STASH_FLAGS
20444 configure: asciidoc version test cleanup
20445 configure: make iconv tests aware of user arguments
20446 configure: rework pthread handling to allow for user defined flags
20447 documentation: Makefile accounts for SHELL_PATH setting
20449 Benjamin Kramer (4):
20450 Remove unused function scope local variables
20451 Move local variables to narrower scopes
20452 Remove unused assignments
20453 Fix various dead stores found by the clang static analyzer
20455 Björn Steinbrink (1):
20456 Mailmap: Allow empty email addresses to be mapped
20459 git-svn: speed up blame command
20462 builtin-send-pack.c: avoid empty structure initialization
20464 Brian Gernhardt (2):
20465 Create USE_ST_TIMESPEC and turn it on for Darwin
20466 Makefile: Set compiler switch for USE_NSEC
20468 Carlos Manuel Duclos Vergara (1):
20469 git-archive: add --output=<file> to send output to a file
20472 config: test for --replace-all with one argument and fix documentation.
20474 Chris Johnsen (13):
20475 git-push.txt: describe how to default to pushing only current branch
20476 Documentation: remove extra quoting/emphasis around literal texts
20477 Documentation/Makefile: make most operations "quiet"
20478 Documentation/Makefile: break up texi pipeline
20479 Documentation: move callouts.xsl to manpage-{base,normal}.xsl
20480 Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl
20481 Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff
20482 Documentation: move quieting params into manpage-base.xsl
20483 Documentation: move "spurious .sp" code into manpage-base.xsl
20484 Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
20485 Documentation: asciidoc.conf: fix verse block with block titles
20486 Documentation: option to render literal text as bold for manpages
20487 Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
20489 Christian Couder (24):
20490 rev-list: estimate number of bisection step left
20491 log-tree: fix patch filename computation in "git format-patch"
20492 quote: implement "sq_dequote_many" to unwrap many args in one string
20493 quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
20494 refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
20495 rev-list: make "bisect_list" variable local to "cmd_rev_list"
20496 rev-list: move bisect related code into its own file
20497 rev-list: move code to show bisect vars into its own function
20498 rev-list: make "show_bisect_vars" non static
20499 rev-list: pass "revs" to "show_bisect_vars"
20500 sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
20501 patch-ids: use the new generic "sha1_pos" function to lookup sha1
20502 bisect: improve error message when branch checkout fails
20503 rev-list: call new "filter_skip" function
20504 bisect: use the new generic "sha1_pos" function to lookup sha1
20505 bisect--helper: implement "git bisect--helper"
20506 bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
20507 bisect: use "bisect--helper" and remove "filter_skipped" function
20508 t6030: test bisecting with paths
20509 rev-list: pass "int flags" as last argument of "show_bisect_vars"
20510 bisect--helper: string output variables together with "&&"
20511 list-objects: add "void *data" parameter to show functions
20512 rev-list: remove last static vars used in "show_commit"
20513 rev-list: add "int bisect_show_flags" in "struct rev_list_info"
20516 Update delta compression message to be less misleading
20518 Daniel Barkalow (8):
20519 Make clone parse the default refspec with the normal code
20520 Use a single function to match names against patterns
20521 Use the matching function to generate the match results
20522 Keep '*' in pattern refspecs
20523 Support '*' in the middle of a refspec
20524 Use a common function to get the pretty name of refs
20525 Move push matching and reporting logic into transport.c
20526 Include log_config module in apache.conf
20529 contrib/difftool: use a separate config namespace for difftool commands
20532 add -i: revisit hunk on editor failure
20535 git-filter-branch: avoid collisions with variables in eval'ed commands
20536 Correct missing SP characters in grammar comment at top of fast-import.c
20537 fast-export: Avoid dropping files from commits
20540 config.txt: Describe special 'none' handling in core.gitProxy.
20543 git-svn: fix ls-tree usage with dash-prefixed paths
20545 Erik Faye-Lund (5):
20546 connect.c: remove a few globals by using git_config callback data
20547 test-suite: adding a test for fast-export with tag variants
20548 builtin-fast-export.c: turn error into warning
20549 builtin-fast-export.c: fix crash on tagged trees
20550 builtin-fast-export.c: handle nested tags
20552 Eugene Letuchy (1):
20553 Make git blame's date output format configurable, like git log
20555 Felipe Contreras (14):
20556 config: Add new option to open an editor.
20557 git config: codestyle cleanups
20558 git_config(): not having a per-repo config file is not an error
20559 git config: trivial rename in preparation for parseopt
20560 git config: reorganize get_color*
20561 git config: reorganize to use parseopt
20562 git config: don't allow multiple config file locations
20563 git config: don't allow multiple variable types
20564 git config: don't allow extra arguments for -e or -l.
20565 git config: don't allow --get-color* and variable type
20566 Add tests for git log --pretty, --format and --oneline.
20567 user-manual: remove some git-foo usage
20568 docbook: change css style
20569 user-manual: the name of the hash function is SHA-1, not sha1
20571 Finn Arne Gangstad (7):
20572 New config push.default to decide default behavior for push
20573 Display warning for default git push with no push.default config
20574 builtin-remote.c: Split out prune_remote as a separate function.
20575 git remote update: New option --prune
20576 git remote update: Report error for non-existing groups
20577 remote: New function remote_is_configured()
20578 git remote update: Fallback to remote if group does not exist
20580 Giuseppe Bilotta (1):
20581 import-tars: separate author from committer
20584 Add warning about known issues to documentation of cvsimport
20585 Cleanup warning about known issues in cvsimport documentation
20586 Add configuration variable for sign-off to format-patch
20589 MinGW: implement mmap
20592 git-svn: add fetch --parent option
20595 builtin-branch: improve output when displaying remote branches
20596 move duplicated get_local_heads() to remote.c
20597 move duplicated ref_newer() to remote.c
20598 move locate_head() to remote.c
20599 remote: simplify guess_remote_head()
20600 remote: make copy_ref() perform a deep copy
20601 remote: let guess_remote_head() optionally return all matches
20602 remote: make match_refs() copy src ref before assigning to peer_ref
20603 remote: make match_refs() not short-circuit
20604 string-list: new for_each_string_list() function
20605 builtin-remote: refactor duplicated cleanup code
20606 builtin-remote: remove unused code in get_ref_states
20607 builtin-remote: rename variables and eliminate redundant function call
20608 builtin-remote: make get_remote_ref_states() always populate states.tracked
20609 builtin-remote: fix two inconsistencies in the output of "show <remote>"
20610 builtin-remote: teach show to display remote HEAD
20611 builtin-remote: add set-head subcommand
20612 builtin-remote: new show output style
20613 builtin-remote: new show output style for push refspecs
20614 send-email: add --confirm option and configuration setting
20615 bash completion: fix completion issues with fetch, pull, and push
20616 bash completion: refactor --strategy completion
20617 bash completion: teach fetch, pull, and push to complete their options
20618 send-email: refactor and ensure prompting doesn't loop forever
20619 send-email: add tests for refactored prompting
20620 send-email: don't attempt to prompt if tty is closed
20621 send-email: ask_default should apply to all emails, not just the first
20622 send-email: correct two tests which were going interactive
20623 send-email: ensure quoted addresses are rfc2047 encoded
20624 send-email: fix nasty bug in ask() function
20627 valgrind: ignore ldso and more libz errors
20628 branch: clean up repeated strlen
20629 add basic branch display tests
20630 test scripts: refactor start_httpd helper
20631 add basic http clone/fetch tests
20632 refactor find_ref_by_name() to accept const list
20633 remote: make guess_remote_head() use exact HEAD lookup if it is available
20634 clone: run post-checkout hook when checking out
20635 improve missing repository error message
20636 config: set help text for --bool-or-int
20637 t3000: use test_cmp instead of diff
20638 ls-files: fix broken --no-empty-directory
20639 ls-files: require worktree when --deleted is given
20640 make oneline reflog dates more consistent with multiline format
20641 remote: improve sorting of "configure for git push" list
20642 Makefile: turn on USE_ST_TIMESPEC for FreeBSD
20643 t0060: fix whitespace in "wc -c" invocation
20644 tests: remove exit after test_done call
20645 for-each-ref: refactor get_short_ref function
20646 for-each-ref: refactor refname handling
20647 for-each-ref: add "upstream" format field
20648 make get_short_ref a public function
20649 branch: show upstream branch when double verbose
20650 Makefile: allow building without perl
20651 tests: skip perl tests if NO_PERL is defined
20652 add tests for remote groups
20655 githooks documentation: post-checkout hook is also called after clone
20658 Enable setting attach as the default in .gitconfig for git-format-patch.
20659 imap.preformattedHTML to tell Thunderbird to send non-flowed text
20661 Johannes Schindelin (23):
20662 Add valgrind support in test scripts
20663 Valgrind support: check for more than just programming errors
20664 test-lib.sh: optionally output to test-results/$TEST.out, too
20665 t/Makefile: provide a 'valgrind' target
20666 Add a script to coalesce the valgrind outputs
20667 Tests: let --valgrind imply --verbose and --tee
20668 test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
20669 valgrind: do not require valgrind 3.4.0 or newer
20670 Avoid segfault with 'git branch' when the HEAD is detached
20671 Turn the flags in struct dir_struct into a single variable
20672 git config: trivial cleanup for editor action
20673 rebase -i: avoid 'git reset' when possible
20674 MinGW: 64-bit file offsets
20675 Brown paper bag fix for MinGW 64-bit stat
20676 Add an (optional, since expensive) test for >2gb clones
20677 MinGW: fix diff --no-index /dev/null ...
20678 winansi: support ESC [ K (erase in line)
20679 test: do not LoadModule log_config_module unconditionally
20680 test-lib: write test results to test-results/<basename>-<pid>
20681 gc --aggressive: make it really aggressive
20682 t7300: fix clean up on Windows
20683 Guard a few Makefile variables against user environments
20684 git-svn: always initialize with core.autocrlf=false
20686 Johannes Sixt (30):
20687 recv_sideband: Bands #2 and #3 always go to stderr
20688 test-suite: Make test script numbers unique
20689 t9400, t9401: Do not force hard-linked clone
20690 test suite: Use 'say' to say something instead of 'test_expect_success'
20691 Call 'say' outside test_expect_success
20692 test-lib: Replace uses of $(expr ...) by POSIX shell features.
20693 test-lib: Simplify test counting.
20694 test-lib: Introduce test_chmod and use it instead of update-index --chmod
20695 t2200, t7004: Avoid glob pattern that also matches files
20696 t5300, t5302, t5303: Do not use /dev/zero
20697 t5602: Work around path mangling on MSYS
20698 test-lib: Work around incompatible sort and find on Windows
20699 test-lib: Work around missing sum on Windows
20700 Tests on Windows: $(pwd) must return Windows-style paths
20701 t0050: Check whether git init detected symbolic link support correctly
20702 test-lib: Infrastructure to test and check for prerequisites
20703 t3600: Use test prerequisite tags
20704 Skip tests that fail if the executable bit is not handled by the filesystem
20705 t5302: Use prerequisite tags to skip 64-bit offset tests
20706 t9100, t9129: Use prerequisite tags for UTF-8 tests
20707 Use prerequisite tags to skip tests that depend on symbolic links
20708 t0060: Fix tests on Windows
20709 Skip tests that require a filesystem that obeys POSIX permissions
20710 t3700: Skip a test with backslashes in pathspec
20711 Use prerequisites to skip tests that need unzip
20712 t7004: Use prerequisite tags to skip tests that need gpg
20713 t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
20714 MinGW: Quote arguments for subprocesses that contain a single-quote
20715 t7005-editor: Use $SHELL_PATH in the editor scripts
20716 t7502-commit: Skip SIGTERM test on Windows
20719 Modify description file to say what this file is
20720 Google has renamed the imap folder
20721 Improve error message for git-filter-branch
20722 Documentation - More examples for git bisect
20724 Junio C Hamano (29):
20725 git-blame: refactor code to emit "porcelain format" output
20726 blame: show "previous" information in --porcelain/--incremental format
20727 Make git-clone respect branch.autosetuprebase
20728 Draft release notes: Carry forward the warning for behaviour changes
20729 Update draft release notes to 1.6.3
20730 builtin-remote.c: no "commented out" code, please
20731 Not all systems use st_[cm]tim field for ns resolution file timestamp
20732 grep: cast printf %.*s "precision" argument explicitly to int
20733 http.c: style cleanups
20734 Improve "git branch --tracking" output
20735 http_init(): Fix config file parsing
20736 http authentication via prompts
20737 Update release notes to 1.6.3
20738 http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL
20739 Read attributes from the index that is being checked out
20740 Update draft release notes to 1.6.3
20741 http tests: Darwin is not that special
20742 Rename interpret/substitute nth_last_branch functions
20743 strbuf_branchname(): a wrapper for branch name shorthands
20744 check-ref-format --branch: give Porcelain a way to grok branch shorthand
20745 Fix branch -m @{-1} newname
20746 strbuf_check_branch_ref(): a helper to check a refname for a branch
20747 check_ref_format(): tighten refname rules
20748 Update draft release notes to 1.6.3
20749 Speed up reflog pruning of unreachable commits
20750 Update draft release notes to 1.6.3
20751 sha1-lookup: fix up the assertion message
20752 Update draft release notes to 1.6.3
20756 Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking
20757 Fix neglect of diff_setup()/diff_setup_done() symmetry.
20760 builtin-push.c: Fix typo: "anythig" -> "anything"
20762 Kevin McConnell (1):
20763 Add --staged to bash completion for git diff
20765 Kjetil Barvik (18):
20766 lstat_cache(): small cleanup and optimisation
20767 lstat_cache(): generalise longest_match_lstat_cache()
20768 lstat_cache(): swap func(length, string) into func(string, length)
20769 unlink_entry(): introduce schedule_dir_for_removal()
20770 create_directories(): remove some memcpy() and strchr() calls
20771 write_entry(): cleanup of some duplicated code
20772 write_entry(): use fstat() instead of lstat() when file is open
20773 show_patch_diff(): remove a call to fstat()
20774 lstat_cache(): print a warning if doing ping-pong between cache types
20775 check_updates(): effective removal of cache entries marked CE_REMOVE
20776 fix compile error when USE_NSEC is defined
20777 make USE_NSEC work as expected
20778 verify_uptodate(): add ce_uptodate(ce) test
20779 write_index(): update index_state->timestamp after flushing to disk
20780 stat_tracking_info(): only count real commits
20781 Record ns-timestamps if possible, but do not use it without USE_NSEC
20782 checkout bugfix: use stat.mtime instead of stat.ctime in two places
20783 Revert "lstat_cache(): print a warning if doing ping-pong between cache types"
20785 Kristian Amlie (1):
20786 Add a test for checking whether gitattributes is honored by checkout.
20788 Linus Torvalds (2):
20789 Clean up reflog unreachability pruning decision
20790 Allow users to un-configure rename detection
20792 Marius Storm-Olsen (2):
20793 Add bare repository indicator for __git_ps1
20794 Fixup: Add bare repository indicator for __git_ps1
20796 Markus Heidelberg (1):
20797 add --html-path to get the location of installed HTML docs
20799 Martin Storsjö (1):
20800 Allow curl to rewind the read buffers
20803 git-send-email.txt: clarify which options take an argument.
20804 git-rev-list.txt: make ascii markup uniform with other pages.
20806 Michael Hendricks (1):
20807 format-patch: add arbitrary email headers
20809 Michael J Gruber (6):
20810 Typo and language fixes for git-checkout.txt
20811 test-lib.sh: Test for presence of git-init in the right path.
20812 test-lib.sh: Allow running the test suite against installed git
20813 git-branch.txt: document -f correctly
20814 Test for local branches being followed with --track
20815 Make local branches behave like remote branches when --tracked
20818 git-svn: support intermediate paths when matching tags/branches
20820 Michele Ballabio (6):
20821 apply: consistent spelling of "don't"
20822 apply: hide unused options from short help
20823 git log: avoid segfault with --all-match
20824 document --force-rebase
20825 rebase: add options passed to git-am
20826 rebase: fix typo (force_rebas -> force-rebas)
20829 Replace ",<,>,& with their respective XML entities in DAV requests
20832 parse-opt: migrate builtin-ls-files.
20833 Tests: use test_cmp instead of diff where possible
20834 http-push: using error() and warning() as appropriate
20835 builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
20836 builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
20837 builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
20838 builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
20839 builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
20840 builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")
20841 builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
20842 refs: use warning() instead of fprintf(stderr, "warning: ")
20844 Nanako Shiraishi (4):
20845 Add --format that is a synonym to --pretty
20846 Give short-hands to --pretty=tformat:%formatstring
20847 Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
20848 Documentation/git.txt: GIT 1.6.2.2 has been out for a while
20851 format-patch: Respect --quiet option
20853 Nguyễn Thái Ngọc Duy (1):
20854 grep: prefer builtin over external one when coloring results
20857 git-p4: remove tabs from usermap file
20860 MinGW: a helper function that translates Win32 API error codes
20861 MinGW: a hardlink implementation
20863 Ramsay Allan Jones (1):
20864 git-instaweb: fix lighttpd configuration on cygwin
20867 grep: micro-optimize hit collection for AND nodes
20868 grep: remove grep_opt argument from match_expr_eval()
20869 grep: add pmatch and eflags arguments to match_one_pattern()
20870 grep: color patterns in output
20871 grep: add support for coloring with external greps
20872 parseopt: add PARSE_OPT_KEEP_UNKNOWN
20873 parseopt: add PARSE_OPT_NO_INTERNAL_HELP
20874 parseopt: make usage optional
20875 archive: use parseopt for local-only options
20876 parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP
20877 parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together
20878 pickaxe: count regex matches only once
20881 rerere: remove duplicated functions
20884 Documentation: enhance branch.<name>.{remote,merge}
20885 Documentation: push.default applies to all remotes
20886 Documentation: branch.*.merge can also affect 'git-push'
20887 Documentation: Introduce "upstream branch"
20889 Shawn O. Pearce (1):
20890 Don't permit ref/branch names to end with ".lock"
20893 git-svn: don't output git commits in quiet mode
20894 git-svn: add a double quiet option to hide git commits
20897 git-send-email.txt: describe --compose better
20898 pretty.c: add %f format specifier to format_commit_message()
20899 format-patch: construct patch filename in one function
20900 format-patch: pass a commit to reopen_stdout()
20901 format-patch: move get_patch_filename() into log-tree
20902 format-patch: --attach/inline uses filename instead of SHA1
20903 format-patch: --numbered-files and --stdout aren't mutually exclusive
20904 completion: add --annotate option to send-email
20905 completion: add --cc and --no-attachment option to format-patch
20906 completion: add --thread=deep/shallow to format-patch
20907 format_sanitized_subject: Don't trim past initial length of strbuf
20909 Sverre Rabbelier (1):
20910 Teach rebase to rebase even if upstream is up to date
20913 http.c: use strbuf API in quote_ref_url
20916 completion: For consistency, change "git rev-parse" to __gitdir calls
20917 completion: Use consistent if [...] convention, not "test"
20918 completion: Better __git_ps1 support when not in working directory
20919 completion: More fixes to prevent unbound variable errors
20922 bash completion: add --format= and --oneline options for "git log"
20925 format-patch: threading test reactivation
20926 Support coverage testing with GCC/gcov
20927 Test that diff can read from stdin
20928 Test diff --dirstat functionality
20930 Test fsck a bit harder
20931 Test log --decorate
20932 Test rev-list --parents/--children
20934 format-patch: track several references
20935 format-patch: thread as reply to cover letter even with in-reply-to
20936 format-patch: support deep threading
20937 Documentation: filter-branch: show --ignore-unmatch in main index-filter example
20939 Todd Zullinger (1):
20940 bash completion: Update 'git am' options
20942 Tor Arne Vestbø (2):
20943 git-rebase: Add --stat and --no-stat for producing diffstat on rebase
20944 git-pull: Allow --stat and --no-stat to be used with --rebase
20946 Wesley J. Landaker (1):
20947 Documentation: git-svn: fix trunk/fetch svn-remote key typo
20949 Wincent Colaiuta (2):
20950 Grammar fixes to "merge" and "patch-id" docs
20951 Grammar fix for "git merge" man page
20954 Version v1.6.2.5; changes since v1.6.2.4:
20955 -----------------------------------------
20958 builtin-merge: fix a typo in an error message
20959 Documentation: fix a grammatical error in api-builtin.txt
20961 Frank Lichtenheld (1):
20962 gitcvs-migration: Link to git-cvsimport documentation
20964 Johannes Schindelin (1):
20965 Fix off-by-one in read_tree_recursive
20967 Junio C Hamano (7):
20968 read-tree A B: do not corrupt cache-tree
20969 Move prime_cache_tree() to cache-tree.c
20970 read-tree -m A B: prime cache-tree from the switched-to tree
20971 checkout branch: prime cache-tree fully
20972 diff -c -p: do not die on submodules
20976 Linus Torvalds (3):
20977 process_{tree,blob}: show objects without buffering
20978 show_object(): push path_name() call further down
20979 grep: fix segfault when "git grep '('" is given
20981 Michał Kiedrowicz (3):
20982 tests: test applying criss-cross rename patch
20983 builtin-apply: keep information about files to be deleted
20984 tests: make test-apply-criss-cross-rename more robust
20987 honor repack.usedeltabaseoffset when fetching packs
20990 test-genrandom: Add newline to usage string
20992 Wincent Colaiuta (1):
20993 git add -p: add missing "q" to patch prompt
20996 Version v1.6.2.4; changes since v1.6.2.3:
20997 -----------------------------------------
20999 Björn Steinbrink (1):
21000 tree_entry_interesting: a pathspec only matches at directory boundary
21002 Clemens Buchacher (3):
21003 add tests for merging with submodules
21004 update cache for conflicting submodule entries
21005 simplify output of conflicting merge
21007 Erik Faye-Lund (4):
21008 test-suite: adding a test for fast-export with tag variants
21009 builtin-fast-export.c: turn error into warning
21010 builtin-fast-export.c: fix crash on tagged trees
21011 builtin-fast-export.c: handle nested tags
21013 Frank Lichtenheld (1):
21014 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
21017 doc/gitattributes: clarify location of config text
21018 add-interactive: refactor mode hunk handling
21021 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
21023 Johannes Schindelin (1):
21024 Fix 'git checkout <submodule>' to update the index
21027 t1301-shared-repo: fix forced modes test
21029 Junio C Hamano (4):
21030 match_tree_entry(): a pathspec only matches at directory boundaries
21031 Describe fixes since 1.6.2.3
21032 Speed up reflog pruning of unreachable commits
21035 Linus Torvalds (1):
21036 Clean up reflog unreachability pruning decision
21038 Markus Heidelberg (2):
21039 doc/git-daemon: add missing arguments to options
21040 doc/git-daemon: add missing arguments to max-connections option
21043 git add -p: new "quit" command at the prompt.
21044 Update git-add.txt according to the new possibilities of 'git add -p'.
21046 Nguyễn Thái Ngọc Duy (1):
21047 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
21050 imap-send: use correct configuration variable in documentation
21052 Thomas Jarosch (1):
21053 Fix buffer overflow in config parser
21056 git-apply: fix option description
21059 Version v1.6.2.3; changes since v1.6.2.2:
21060 -----------------------------------------
21062 Björn Steinbrink (1):
21063 process_{tree,blob}: Remove useless xstrdup calls
21066 t7700-repack: add two new tests demonstrating repacking flaws
21067 git-repack.sh: don't use --kept-pack-only option to pack-objects
21068 pack-objects: only repack or loosen objects residing in "local" packs
21069 Remove --kept-pack-only option and associated infrastructure
21070 t7700: demonstrate repack flaw which may loosen objects unnecessarily
21071 pack-objects: don't loosen objects available in alternate or kept packs
21074 git-repack: use non-dashed update-server-info
21076 Daniel Cheng (aka SDiZ) (1):
21077 State the effect of filter-branch on graft explicitly
21080 Change double quotes to single quotes in message
21083 Documentation: clarify .gitattributes search
21086 t1301: loosen test for forced modes
21087 commit: abort commit if interactive add failed
21090 Move chmod(foo, 0444) into move_temp_to_file()
21093 git submodule: fix usage line
21095 Junio C Hamano (12):
21096 git-repack: resist stray environment variable
21097 has_sha1_pack(): refactor "pretend these packs do not exist" interface
21098 has_sha1_kept_pack(): take "struct rev_info"
21099 Consolidate ignore_packed logic more
21100 Simplify is_kept_pack()
21101 is_kept_pack(): final clean-up
21102 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
21103 "core.sharedrepository = 0mode" should set, not loosen
21104 move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
21105 set_shared_perm(): sometimes we know what the final mode bits should look like
21106 Start 1.6.2.3 preparation
21109 Linus Torvalds (1):
21110 process_{tree,blob}: Remove useless xstrdup calls
21112 Markus Heidelberg (1):
21113 doc/git-pack-refs: fix two grammar issues
21116 git-checkout.txt: fix incorrect statement about HEAD and index
21117 git-checkout.txt: clarify that <branch> applies when no path is given.
21118 git-pull.sh: better warning message for "git pull" on detached head.
21121 Version v1.6.2.2; changes since v1.6.2.1:
21122 -----------------------------------------
21125 Documentation: update graph api example.
21128 git-branch: display "was sha1" on branch deletion rather than just "sha1"
21130 Carlo Marcelo Arenas Belon (1):
21131 documentation: update cvsimport description of "-r" for recent clone
21133 Daniel Barkalow (1):
21134 Give error when no remote is configured
21136 Daniel Cheng (aka SDiZ) (1):
21137 Fix bash completion in path with spaces
21140 everyday: use the dashless form of git-init
21142 David J. Mellor (12):
21143 Documentation: minor grammatical fixes in git-archive.txt.
21144 Documentation: reword the "Description" section of git-bisect.txt.
21145 Documentation: minor grammatical fixes in git-blame.txt.
21146 Documentation: minor grammatical fixes in git-branch.txt.
21147 Documentation: reworded the "Description" section of git-bisect.txt.
21148 Documentation: reword example text in git-bisect.txt.
21149 Documentation: remove some uses of the passive voice in git-bisect.txt
21150 Documentation: minor grammatical fixes and rewording in git-bundle.txt
21151 Documentation: minor grammatical fixes in git-cat-file.txt
21152 Documentation: minor grammatical fixes in git-check-attr.txt
21153 Documentation: minor grammatical fix in git-check-ref-format.txt
21154 Documentation: Remove spurious uses of "you" in git-bisect.txt.
21157 test-lib: Clean up comments and Makefile.
21160 git-svn: fix ls-tree usage with dash-prefixed paths
21163 Documentation: Remove an odd "instead"
21166 doc: clarify how -S works
21167 ls-files: require worktree when --deleted is given
21168 fix portability problem with IS_RUN_COMMAND_ERR
21170 Johannes Schindelin (4):
21171 rsync transport: allow local paths, and fix tests
21172 Smudge the files fed to external diff and textconv
21173 import-zips: fix thinko
21174 mailmap: resurrect lower-casing of email addresses
21177 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
21178 diff --no-index: Do not generate patch output if other output is requested
21180 Junio C Hamano (6):
21181 read-tree A B C: do not create a bogus index and do not segfault
21182 Remove total confusion from git-fetch and git-push
21183 blame: read custom grafts given by -S before calling setup_revisions()
21184 Update draft release notes to 1.6.2.2
21185 Update draft release notes to 1.6.2.2
21188 Linus Torvalds (1):
21189 close_sha1_file(): make it easier to diagnose errors
21191 Michael J Gruber (2):
21192 git submodule: Add test cases for git submodule add
21193 git submodule: Fix adding of submodules at paths with ./, .. and //
21195 Nico -telmich- Schottelius (1):
21196 git-tag(1): add hint about commit messages
21199 avoid possible overflow in delta size filtering computation
21202 diffcore-pickaxe: use memmem()
21203 optimize compat/ memmem()
21204 pickaxe: count regex matches only once
21206 Shawn O. Pearce (1):
21207 Increase the size of the die/warning buffer to avoid truncation
21210 format-patch: --numbered-files and --stdout aren't mutually exclusive
21213 send-email: respect in-reply-to regardless of threading
21214 send-email: test --no-thread --in-reply-to combination
21215 Documentation: format-patch --root clarifications
21216 bash completion: only show 'log --merge' if merging
21219 Version v1.6.2.1; changes since v1.6.2:
21220 ---------------------------------------
21223 builtin-revert.c: release index lock when cherry-picking an empty commit
21225 Christian Couder (1):
21226 Documentation: fix badly indented paragraphs in "--bisect-all" description
21229 Ensure proper setup of git_dir for git-hash-object
21231 Finn Arne Gangstad (1):
21232 Support "\" in non-wildcard exclusion entries
21235 send-email: allow send-email to run outside a repo
21236 send-email: handle multiple Cc addresses when reading mbox message
21237 send-email: --suppress-cc improvements
21238 send-email: don't create temporary compose file until it is needed
21241 never fallback relative times to absolute
21242 t1300: use test_must_fail as appropriate
21243 document config --bool-or-int
21246 Make the 'lock file' exists error more informative
21248 Junio C Hamano (4):
21249 git-add -i/-p: learn to unwrap C-quoted paths
21250 Beginning of 1.6.2 maintenance track
21251 Update draft release notes for 1.6.2.1
21255 cleanup: add isascii()
21258 Version v1.6.2; changes since v1.6.2-rc2:
21259 -----------------------------------------
21262 git-svn - return original format_svn_date semantics
21264 Christian Couder (2):
21265 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
21266 bisect: fix another instance of eval'ed string
21269 added missing backtick in git-apply.txt
21271 David J. Mellor (4):
21272 Documentation: minor grammatical fixes.
21273 Documentation: minor grammatical fixes.
21274 Documentation: minor grammatical fixes.
21275 Documentation: minor grammatical fixes.
21278 git-svn: disable broken symlink workaround by default
21281 t5540-http-push.sh: avoid non-portable grep -P
21284 t3400-rebase: Move detached HEAD check earlier
21286 Junio C Hamano (2):
21287 git-am: make --abort less dangerous
21290 Michael J Gruber (1):
21291 git-am: Keep index in case of abort with dirty index
21294 Fix odb_mkstemp() on AIX
21295 Documentation: Typos / spelling fixes in RelNotes
21296 Documentation: Expand a couple of abbreviations
21297 Documentation: Typo / spelling / formatting fixes
21299 Paul Mackerras (1):
21300 gitk: Fix possible infinite loop and display corruption
21303 Documentation/git-archive.txt: Note attributes
21305 Todd Zullinger (1):
21306 git-rebase: Update --whitespace documentation
21309 Version v1.6.2-rc2; changes since v1.6.2-rc1:
21310 ---------------------------------------------
21312 Abhijit Menon-Sen (1):
21313 Convert git-* invocations to "git *" in the svnimport example.
21315 Alexandre Julliard (3):
21316 git.el: Make sure that file lists are sorted as they are created.
21317 git.el: Improve the confirmation message on remove and revert.
21318 Add a README in the contrib/emacs directory.
21321 trace: Fixed a minor typo in an error message.
21324 git-svn fix to avoid using strftime %z
21326 Brian Gernhardt (1):
21327 git-svn: Create leading directories in create-ignore
21329 Christian Couder (1):
21330 README: fix path to "gitcvs-migration.txt" and be more consistent
21333 git-svn: fix delete+add branch tracking with empty files
21335 Felipe Contreras (2):
21336 git add: trivial codestyle cleanup
21337 sha1_file.c: fix typo
21340 Documentation/git-push: --all, --mirror, --tags can not be combined
21341 Install builtins with the user and group of the installing personality
21342 git-quiltimport: preserve standard input to be able to read user input
21344 Giuseppe Bilotta (1):
21345 gitweb: fix wrong base URL when non-root DirectoryIndex
21348 disallow providing multiple upstream branches to rebase, pull --rebase
21349 Allow HTTP tests to run on Darwin
21351 Johannes Schindelin (2):
21352 Introduce the function strip_path_suffix()
21353 system_path(): simplify using strip_path_suffix(), and add suffix "git"
21356 gitattributes.txt: Path matching rules are explained in gitignore.txt
21358 Junio C Hamano (4):
21359 git-svn: fix parsing of timestamp obtained from svn
21360 tests: fix "export var=val"
21361 Make sure objects/pack exists before creating a new pack
21364 Lars Noschinski (1):
21365 filter-branch -d: Export GIT_DIR earlier
21367 Linus Torvalds (1):
21368 Support 'raw' date format
21370 Marc Branchaud (1):
21371 Docs: Expand explanation of the use of + in git push refspecs.
21373 Marcel M. Cary (2):
21374 gitweb: Fix warnings with override permitted but no repo override
21375 gitweb: Hyperlink multiple git hashes on the same commit message line
21378 Document git blame --reverse.
21379 More friendly message when locking the index fails.
21381 Michael J Gruber (1):
21382 Fix typo in contrib/examples/git-svnimport.txt
21385 Skip timestamp differences for diff --no-index
21388 git-p4: avoid syncing duplicate changes
21390 Peter Oberndorfer (1):
21391 git-svn: read the dcommit url from the config file on a per remote basis
21394 bash: add missing 'git merge' options
21395 bash: update 'git svn' options
21398 bash completion: refactor common log, shortlog and gitk options
21399 bash completion: only show 'log --merge' if merging
21401 Todd Zullinger (1):
21402 Documentation: Note file formats send-email accepts
21405 Version v1.6.2-rc1; changes since v1.6.2-rc0:
21406 ---------------------------------------------
21408 Alexandre Julliard (1):
21409 Describe notable git.el changes in the release notes
21411 Anton Gyllenberg (1):
21412 test case for regression caused by git-svn empty symlink fix
21414 Christian Couder (1):
21415 rev-list: fix showing distance when using --bisect-all
21418 git-svn: Print revision while searching for earliest use of path
21421 git-svn: Fix for rewriteRoot URL containing username.
21424 fast-export: ensure we traverse commits in topological order
21427 filter-branch: Add more error-handling
21430 git-svn: allow disabling expensive broken symlink checks
21431 git-svn: fix broken symlink workaround when switching branches
21434 submodule: add --no-fetch parameter to update command
21437 Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter
21439 Jakub Narębski (1):
21440 gitweb: Better regexp for SHA-1 committag match
21443 symbolic-ref: allow refs/<whatever> in HEAD
21446 Update documentation to add further information about using Thunderbird with git-imap-send.
21448 Johannes Schindelin (4):
21449 Let ls-files strip trailing slashes in submodules' paths
21450 submodule: warn about non-submodules
21451 Add two extra tests for git rebase
21452 gc: make --prune useful again by accepting an optional parameter
21455 Make test-path-utils more robust against incorrect use
21456 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
21457 Test and fix normalize_path_copy()
21458 Remove unused normalize_absolute_path()
21460 Junio C Hamano (16):
21461 Revert "Merge branch 'js/notes'"
21462 Modernize t5400 test script
21463 remote prune: warn dangling symrefs
21464 Warn use of "origin" when remotes/origin/HEAD is dangling
21465 Drop double-semicolon in C
21466 receive-pack: receive.denyDeleteCurrent
21467 builtin-receive-pack.c: do not initialize statics to 0
21468 revision traversal and pack: notice and die on missing commit
21469 Squelch overzealous "ignoring dangling symref" in an empty repository
21470 Make repack less likely to corrupt repository
21471 Prepare for 1.6.1.4.
21472 Revert "validate_headref: tighten ref-matching to just branches"
21473 Install the default "master" branch configuration after cloning a void
21474 Teach the "@{-1} syntax to "git branch"
21475 Teach @{-1} to git merge
21479 Remove redundant bit clears from diff_setup()
21482 tree.c: allow read_tree_recursive() to traverse gitlink entries
21484 Marcel M. Cary (1):
21485 git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
21487 Marius Storm-Olsen (5):
21488 Add mailmap.file as configurational option for mailmap location
21489 Add find_insert_index, insert_at_index and clear_func functions to string_list
21490 Add map_user() and clear_mailmap() to mailmap
21491 Change current mailmap usage to do matching on both name and email of author/committer.
21492 Move mailmap documentation into separate file
21495 git-rebase.txt: --interactive does not work with --whitespace
21498 bash-completion: Complete the values of color.interactive, color.ui, color.pager
21500 Matt McCutchen (1):
21501 gitweb: add $prevent_xss option to prevent XSS by repository content
21503 Michael J Gruber (1):
21504 Fix the installation path for html documentation
21507 Bugfix: GIT_EXTERNAL_DIFF with more than one changed files
21510 Fix contrib/hooks/post-receive-email for new duplicate branch
21513 Fix GIT_CEILING_DIRECTORIES on Windows
21514 builtin-receive-pack.c: fix compiler warnings about format string
21517 Move 'rev-parse --git-dir' test to t1500
21518 t1500: more 'git rev-parse --git-dir' tests
21519 bash: fix misspelled 'git svn' option
21522 git-svn: abstract out a block into new method other_gs()
21525 doc/bundle: Use the more conventional suffix '.bundle'
21527 Shawn O. Pearce (2):
21528 Clear the delta base cache during fast-import checkpoint
21529 Clear the delta base cache if a pack is rebuilt
21531 Sitaram Chamarty (1):
21532 Documentation: clarify commits affected by gitk --merge
21535 add -p: get rid of Git.pm warnings about unitialized values
21536 Makefile: resort filenames alphabetically
21537 Generalize and libify index_is_dirty() to index_differs_from(...)
21540 use a hash of the lock token as the suffix for PUT/MOVE
21543 completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.
21544 completion: Get rid of tabbed indentation in comments. Replace with spaces.
21547 log: do not print ellipses with --abbrev-commit
21548 Documentation: pruning recipe for destructive filter-branch
21550 Todd Zullinger (1):
21551 git-web--browse: Fix check for /bin/start
21554 Version v1.6.2-rc0; changes since v1.6.1.4:
21555 -------------------------------------------
21558 builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily
21559 git.c: make autocorrected aliases work
21560 t7501-commit.sh: explicitly check that -F prevents invoking the editor
21562 Alexander Potashev (4):
21563 remove trailing LF in die() messages
21564 add is_dot_or_dotdot inline function
21565 Allow cloning to an existing empty directory
21566 Replace deprecated dashed git commands in usage
21568 Alexandre Julliard (8):
21569 git.el: Add a checkout command.
21570 git.el: Add a command to create a new branch.
21571 git.el: Add commands for cherry-pick and revert.
21572 git.el: Make git-run-command-region display the error if any.
21573 git.el: Set a regexp for paragraph-separate in log-edit mode.
21574 git.el: Use integer instead of character constants in case statement.
21575 git.el: Add some notes about Emacs versions compatibility.
21576 emacs: Remove the no longer maintained vc-git package.
21578 Arjen Laarhoven (1):
21579 t/t4202-log.sh: Add testcases
21581 Benjamin Kramer (1):
21584 Boyd Stephen Smith Jr (2):
21585 color-words: Support diff.wordregex config option
21586 Change the spelling of "wordregex".
21589 t7700: demonstrate misbehavior of 'repack -a' when local packs exist
21590 Makefile: use shell for-loop rather than Make's foreach loop during install
21592 Charles Bailey (7):
21593 Fix some tab/space inconsistencies in git-mergetool.sh
21594 Add -y/--no-prompt option to mergetool
21595 mergetool: Add prompt to continue after failing to merge a file
21596 mergetool: Don't keep temporary merge files unless told to
21597 mergetool: respect autocrlf by using checkout-index
21598 mergetool: Add a test for running mergetool in a sub-directory
21599 mergetool: fix running mergetool in sub-directories
21601 Christian Couder (1):
21602 sha1_file: make "read_object" static
21604 Clemens Buchacher (2):
21605 clean up pathspec matching
21606 remove pathspec_match, use match_pathspec instead
21609 contrib: add 'git difftool' for launching common merge tools
21610 difftool: fix documentation problems
21611 difftool: put the cursor on the editable file for Vim
21612 contrib/difftool: Don't repeat merge tool candidates
21614 David M. Syzdek (1):
21615 autoconf: Enable threaded delta search when pthreads are supported
21618 git-svn: add --authors-file test
21619 git-svn: handle empty files marked as symlinks in SVN
21620 git-svn: better attempt to handle broken symlink updates
21621 git-svn: fix SVN 1.1.x compatibility
21622 git-svn: avoid importing nested git repos
21623 git-svn: fix memory leak when checking for empty symlinks
21626 cvsserver: add option to configure commit message
21627 cvsserver: change generation of CVS author names
21629 Giuseppe Bilotta (16):
21630 gitweb: add patch view
21631 gitweb: change call pattern for git_commitdiff
21632 gitweb: add patches view
21633 gitweb: link to patch(es) view in commit(diff) and (short)log view
21634 gitweb: use href() when generating URLs in OPML
21635 gitweb: don't use pathinfo for global actions
21636 gitweb: suggest name for OPML view
21637 gitweb: channel image in rss feed
21638 gitweb: feed generator metadata
21639 gitweb: rss feed managingEditor
21640 gitweb: rss channel date
21641 gitweb: last-modified time should be commiter, not author
21642 gitweb: check if-modified-since for feeds
21643 gitweb: make static files accessible with PATH_INFO
21644 gitweb: webserver config for PATH_INFO
21645 gitweb: align comments to code
21648 Make opt_parse_with_commit() non-static
21649 Make has_commit() non-static
21650 git-tag: Add --contains option
21652 Jakub Narębski (4):
21653 gitweb: Move 'lineno' id from link to row element in git_blame
21654 gitweb: A bit of code cleanup in git_blame()
21655 gitweb: cache $parent_commit info in git_blame()
21656 gitweb: Update README that gitweb works better with PATH_INFO
21659 git-am: minor cleanups
21660 Makefile: minor improvements for Mac OS X (Darwin)
21663 Makefile: clean up TEST_PROGRAMS definition
21664 color: make it easier for non-config to parse color specs
21665 expand --pretty=format color options
21666 diff: refactor tempfile cleanup handling
21667 chain kill signals for cleanup functions
21668 refactor signal handling for cleanup functions
21669 pager: do wait_for_pager on signal death
21670 validate_headref: tighten ref-matching to just branches
21671 symbolic ref: refuse non-ref targets in HEAD
21672 t0005: use SIGTERM for sigchain test
21674 Johannes Gilger (1):
21675 mergetool: Don't repeat merge tool candidates
21677 Johannes Schindelin (24):
21678 Force t5302 to use a single thread
21679 Introduce commit notes
21680 Add a script to edit/inspect notes
21681 git wrapper: Make while loop more reader-friendly
21682 bundle: allow rev-list options to exclude annotated tags
21683 show <tag>: reuse pp_user_info() instead of duplicating code
21684 Implement the patience diff algorithm
21685 Introduce the diff option '--patience'
21686 bash completions: Add the --patience option
21687 Speed up git notes lookup
21688 Add an expensive test for git-notes
21689 Add color_fwrite_lines(), a function coloring each line individually
21690 color-words: refactor word splitting and use ALLOC_GROW()
21691 color-words: change algorithm to allow for 0-character word boundaries
21692 color-words: take an optional regular expression describing words
21693 Fix parsing of @{-1}@{1}
21694 rebase -i --root: fix check for number of arguments
21695 t3404 & t3411: undo copy&paste
21696 lib-rebase.sh: Document what set_fake_editor() does
21697 test-lib.sh: introduce test_commit() and test_merge() helpers
21701 Fix 'git diff --no-index' with a non-existing symlink target
21704 Windows: Fix signal numbers
21705 Windows: Fix intermittent failures of t7701
21708 Fix Documentation typos surrounding the word 'handful'.
21711 git-am: Make it easier to see which patch failed
21713 Junio C Hamano (26):
21714 Document "git-reset --merge"
21716 Resurrect "git apply --flags -" to read from the standard input
21717 git-am: add --directory=<dir> option
21718 Update 1.6.2 draft release notes
21719 git-am: fix shell quoting
21720 checkout: implement "@{-N}" shortcut name for N-th last branch
21721 git-am: re-fix the diag message printing
21722 interpret_nth_last_branch(): avoid traversing the reflog twice
21723 Fix reflog parsing for a malformed branch switching entry
21724 interpret_nth_last_branch(): plug small memleak
21725 Introduce for_each_recent_reflog_ent().
21726 Simplify parsing branch switching events in reflog
21727 http-push.c: style fixes
21728 am: Add --committer-date-is-author-date option
21729 rebase -i: correctly remember --root flag across --continue
21730 tests: Avoid single-shot environment export for shell function invocation
21731 Update draft release notes to 1.6.2
21732 fsck: HEAD is part of refs
21733 fsck: check loose objects from alternate object stores by default
21734 http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI
21735 receive-pack: explain what to do when push updates the current branch
21736 t3412: further simplify setting of GIT_EDITOR
21737 tests: fix test_commit() for case insensitive filesystems
21738 Makefile: fix misdetection of relative pathnames
21742 test more combinations of ignore-whitespace options to diff
21744 Kirill Smelkov (1):
21745 mailinfo: cleanup extra spaces for complex 'From:'
21748 Cleanup of unused symcache variable inside diff-lib.c
21749 lstat_cache(): more cache effective symlink/directory detection
21750 lstat_cache(): introduce has_symlink_or_noent_leading_path() function
21751 lstat_cache(): introduce has_dirs_only_path() function
21752 lstat_cache(): introduce invalidate_lstat_cache() function
21753 lstat_cache(): introduce clear_lstat_cache() function
21756 bash completion: Add '--intent-to-add' long option for 'git add'
21757 bash completion: Use 'git add' completions for 'git stage'
21759 Linus Torvalds (1):
21760 Add 'merge' mode to 'git reset'
21762 Marcel Koeppen (1):
21763 git-svn: Show UUID in svn info for added directories with svn 1.5.5
21765 Markus Heidelberg (10):
21766 git-cherry: make <upstream> parameter optional
21767 Documentation: clarify which parameters are optional to git-cherry
21768 contrib/vim: change URL to point to the latest syntax files
21769 Documentation: let asciidoc align related options
21770 mergetool: put the cursor on the editable file for Vim
21771 contrib/difftool: change trap condition from SIGINT to INT
21772 contrib/difftool: remove distracting 'echo' in the SIGINT handler
21773 use uppercase POSIX compliant signals for the 'trap' command
21774 bash completion: add 'rename' subcommand to git-remote
21775 contrib/difftool: add support for Kompare
21778 gitweb: unify boolean feature subroutines
21780 Michele Ballabio (1):
21781 git-shortlog.txt: fix example about .mailmap
21784 Add support for a pdf version of the user manual
21785 parse-opt: migrate builtin-apply.
21786 gittutorial: remove misleading note
21788 Nanako Shiraishi (3):
21789 git-am: Add --ignore-date option
21790 Mention "local convention" rule in the CodingGuidelines
21791 git-bundle doc: update examples
21794 autodetect number of CPUs by default when using threads
21795 pack-objects: don't use too many threads with few objects
21798 config.mak.in: define paths without trailing slash
21801 git-svn: Add --localtime option to "fetch"
21803 Pierre Habouzit (1):
21804 filter-branch: add git_commit_non_empty_tree and --prune-empty.
21806 Ralf Wildenhues (1):
21807 Fix naming scheme for configure cache variables.
21810 diff: add option to show context between close hunks
21811 strbuf: instate cleanup rule in case of non-memory errors
21812 grep -w: forward to next possible position after rejected match
21813 grep: don't call regexec() for fixed strings
21816 Change NUL char handling of isspecial()
21817 Add is_regex_special()
21818 Optimize color_parse_mem
21821 bash: add '--merge' to 'git reset'
21822 bash: remove unnecessary checks for long options with argument
21823 bash: add missing format-patch command line options
21824 bash: refactor 'git log --pretty=<format>' options
21827 commit: more compact summary and without extra quotes
21828 tutorial-2: Update with the new "git commit" ouput
21830 Serge van den Boom (1):
21831 Makefile: Make 'configure --with-expat=path' actually work
21833 Stefan Karpinski (2):
21834 git-cvsserver: handle CVS 'noop' command.
21835 git-cvsserver: run post-update hook *after* update.
21837 Steffen Prohaska (6):
21838 Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)
21839 git_extract_argv0_path(): Move check for valid argv0 from caller to callee
21840 Add calls to git_extract_argv0_path() in programs that call git_config_*
21841 Modify setup_path() to only add git_exec_path() to PATH
21842 Compute prefix at runtime if RUNTIME_PREFIX is set
21843 Windows: Revert to default paths and convert them by RUNTIME_PREFIX
21846 checkout: don't crash on file checkout before running post-checkout hook
21847 Move run_hook() from builtin-commit.c into run-command.c (libgit)
21848 api-run-command.txt: talk about run_hook()
21849 run_hook(): check the executability of the hook before filling argv
21850 run_hook(): allow more than 9 hook arguments
21853 Refactor git_set_argv0_path() to git_extract_argv0_path()
21855 Sverre Rabbelier (1):
21856 Allow cloning an empty repository
21859 http-push: refactor lock-related headers creation for curl requests
21860 http-push: refactor request url creation
21861 http-push: add back underscore separator before lock token
21862 http-push: wrap signature of get_remote_object_url
21865 bash-completion: Support running when set -u is enabled
21866 bash-completion: Try bash completions before simple filetype
21867 bash-completion: Add comments to remind about required arguments
21868 make: Remove -pthread on Darwin (it is included by cstdlib).
21871 Fix the building of user-manual.texi and gitman.texi documents
21872 Fix the building of gitman.info document
21873 diff-options.txt: Fix asciidoc markup issue
21876 rebase -i: execute hook only after argument checking
21877 rebase: learn to rebase root commit
21878 rebase -i: learn to rebase root commit
21879 rebase: update documentation for --root
21880 notes: fix core.notesRef documentation
21881 color-words: enable REG_NEWLINE to help user
21882 color-words: expand docs with precise semantics
21883 color-words: make regex configurable via attributes
21884 sha1_name: tweak @{-N} lookup
21885 sha1_name: support @{-N} syntax in get_sha1()
21886 checkout: implement "-" abbreviation, add docs and tests
21887 bash completion: move pickaxe options to log
21888 bash completion: refactor diff options
21889 t1505: remove debugging cruft
21890 t3412: clean up GIT_EDITOR usage
21891 t3412: use log|name-rev instead of log --graph
21892 bash: offer to show (un)staged changes
21893 add -p: change prompt separator for 'g'
21894 add -p: trap Ctrl-D in 'goto' mode
21895 contrib git-resurrect: find traces of a branch name and resurrect it
21896 add -p: prompt for single characters
21897 add -p: print errors in separate color
21898 add -p: import Term::ReadKey with 'require'
21900 Tor Arne Vestbø (1):
21901 git-notes: fix printing of multi-line notes
21903 Vitaly "_Vi" Shukela (3):
21904 git-svn: add --ignore-paths option for fetching
21905 git-svn: documented --ignore-paths
21906 git-svn: Add test for --ignore-paths parameter
21908 William Pursell (5):
21909 Add subroutine to display one-line summary of hunks
21910 Add 'g' command to go to a hunk
21911 git-add -i/-p: Change prompt separater from slash to comma
21912 Add / command in add --patch
21913 In add --patch, Handle K,k,J,j slightly more gracefully.
21915 jidanni@jidanni.org (1):
21916 git-show-branch doc: show -g as synonym to --reflog in the list
21918 martin f. krafft (1):
21919 git-am: implement --reject option passed to git-apply
21922 Version v1.6.1.4; changes since v1.6.1.3:
21923 -----------------------------------------
21926 Documentation: update graph api example.
21927 builtin-merge: fix a typo in an error message
21928 Documentation: fix a grammatical error in api-builtin.txt
21930 Björn Steinbrink (2):
21931 tree_entry_interesting: a pathspec only matches at directory boundary
21932 process_{tree,blob}: Remove useless xstrdup calls
21935 t7700-repack: add two new tests demonstrating repacking flaws
21936 git-repack.sh: don't use --kept-pack-only option to pack-objects
21937 pack-objects: only repack or loosen objects residing in "local" packs
21938 Remove --kept-pack-only option and associated infrastructure
21939 git-branch: display "was sha1" on branch deletion rather than just "sha1"
21940 t7700: demonstrate repack flaw which may loosen objects unnecessarily
21941 pack-objects: don't loosen objects available in alternate or kept packs
21944 builtin-revert.c: release index lock when cherry-picking an empty commit
21946 Christian Couder (3):
21947 rev-list: fix showing distance when using --bisect-all
21948 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
21949 bisect: fix another instance of eval'ed string
21952 git-repack: use non-dashed update-server-info
21954 Daniel Cheng (aka SDiZ) (2):
21955 Fix bash completion in path with spaces
21956 State the effect of filter-branch on graft explicitly
21959 added missing backtick in git-apply.txt
21962 everyday: use the dashless form of git-init
21964 David J. Mellor (1):
21965 Documentation: minor grammatical fixes.
21968 fast-export: ensure we traverse commits in topological order
21969 Ensure proper setup of git_dir for git-hash-object
21972 test-lib: Clean up comments and Makefile.
21975 filter-branch: Fix fatal error on bare repositories
21977 Finn Arne Gangstad (1):
21978 Support "\" in non-wildcard exclusion entries
21980 Frank Lichtenheld (1):
21981 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
21983 Geoffrey Thomas (2):
21984 utf8: add utf8_strwidth()
21985 builtin-blame.c: Use utf8_strwidth for author's names
21988 Documentation/git-push: --all, --mirror, --tags can not be combined
21991 Documentation: Remove an odd "instead"
21994 Documentation: clarify .gitattributes search
21997 builtin-remote: make rm() use properly named variable to hold return value
21998 builtin-remote: make rm operation safer in mirrored repository
22001 git: s/run_command/run_builtin/
22002 run_command(): handle missing command errors more gracefully
22003 run_command(): help callers distinguish errors
22004 git: use run_command() to execute dashed externals
22005 commit: abort commit if interactive add failed
22007 Johannes Schindelin (3):
22008 Fix submodule squashing into unrelated commit
22009 filter-branch: do not consider diverging submodules a 'dirty worktree'
22010 import-zips: fix thinko
22013 Make test-path-utils more robust against incorrect use
22014 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
22015 Test and fix normalize_path_copy()
22016 Remove unused normalize_absolute_path()
22017 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
22018 diff --no-index: Do not generate patch output if other output is requested
22020 Junio C Hamano (19):
22021 revision traversal: allow UNINTERESTING objects to be missing
22022 rebase -i squashes submodule changes into unrelated commit
22023 add -u: do not fail to resolve a path as deleted
22024 revision traversal and pack: notice and die on missing commit
22025 Make repack less likely to corrupt repository
22026 Prepare for 1.6.1.4.
22027 tests: fix "export var=val"
22028 Make sure objects/pack exists before creating a new pack
22029 git-repack: resist stray environment variable
22030 has_sha1_pack(): refactor "pretend these packs do not exist" interface
22031 has_sha1_kept_pack(): take "struct rev_info"
22032 Consolidate ignore_packed logic more
22033 Simplify is_kept_pack()
22034 is_kept_pack(): final clean-up
22035 blame: read custom grafts given by -S before calling setup_revisions()
22036 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
22037 match_tree_entry(): a pathspec only matches at directory boundaries
22038 diff -c -p: do not die on submodules
22041 Kirill Smelkov (4):
22042 mailinfo: correctly handle multiline 'Subject:' header
22043 mailinfo: 'From:' header should be unfold as well
22044 mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
22045 mailinfo: tests for RFC2047 examples
22047 Linus Torvalds (3):
22048 close_sha1_file(): make it easier to diagnose errors
22049 process_{tree,blob}: Remove useless xstrdup calls
22050 grep: fix segfault when "git grep '('" is given
22052 Markus Heidelberg (1):
22053 doc/git-daemon: add missing arguments to options
22055 Matt McCutchen (1):
22056 gitweb: add $prevent_xss option to prevent XSS by repository content
22059 Document git blame --reverse.
22060 More friendly message when locking the index fails.
22061 git-checkout.txt: fix incorrect statement about HEAD and index
22062 git-checkout.txt: clarify that <branch> applies when no path is given.
22065 Skip timestamp differences for diff --no-index
22068 Fix odb_mkstemp() on AIX
22070 Nico -telmich- Schottelius (1):
22071 git-tag(1): add hint about commit messages
22074 avoid possible overflow in delta size filtering computation
22077 Fix GIT_CEILING_DIRECTORIES on Windows
22079 Shawn O. Pearce (2):
22080 Clear the delta base cache during fast-import checkpoint
22081 Clear the delta base cache if a pack is rebuilt
22084 test-genrandom: Add newline to usage string
22086 Thomas Jarosch (1):
22087 Fix buffer overflow in config parser
22090 Documentation: format-patch --root clarifications
22091 bash completion: only show 'log --merge' if merging
22093 Todd Zullinger (1):
22094 Documentation: Note file formats send-email accepts
22097 Version v1.6.1.3; changes since v1.6.1.2:
22098 -----------------------------------------
22100 Anders Melchiorsen (2):
22101 Documentation: more git push examples
22102 Documentation: rework src/dst description in git push
22104 David J. Mellor (1):
22105 Fixed broken git help -w when installing from RPM
22108 fix typo in Documentation
22109 add test-dump-cache-tree in Makefile
22111 Johannes Schindelin (2):
22112 revision walker: include a detached HEAD in --all
22113 apply: fix access to an uninitialized mode variable, found by valgrind
22115 Junio C Hamano (6):
22116 bundle: allow the same ref to be given more than once
22117 Documentation: simplify refspec format description
22118 diff.c: output correct index lines for a split diff
22119 builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
22120 grep: pass -I (ignore binary) down to external grep
22124 test more combinations of ignore-whitespace options to diff
22125 Fix combined use of whitespace ignore options to diff
22127 Linus Torvalds (1):
22128 Wrap inflate and other zlib routines for better error reporting
22131 Missing && in t/t7001.sh.
22132 Add a testcase for "git mv -f" on untracked files.
22133 builtin-mv.c: check for unversionned files before looking at the destination.
22136 merge: fix out-of-bounds memory access
22139 Fix gitdir detection when in subdir of gitdir
22142 urls.txt: document optional port specification in git URLS
22144 William Pursell (1):
22145 User-manual: "git stash <comment>" form is long gone
22148 Version v1.6.1.2; changes since v1.6.1.1:
22149 -----------------------------------------
22151 Björn Steinbrink (1):
22152 Rename detection: Avoid repeated filespec population
22155 avoid 31-bit truncation in write_loose_object
22157 Johannes Schindelin (2):
22158 get_sha1_basic(): fix invalid memory access, found by valgrind
22159 test-path-utils: Fix off by one, found by valgrind
22161 Junio C Hamano (4):
22162 ls-tree: add --full-tree option
22163 Teach format-patch to handle output directory relative to cwd
22164 send-pack: do not send unknown object name from ".have" to pack-objects
22167 Marcel M. Cary (1):
22168 git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
22170 Markus Heidelberg (2):
22171 git-commit: color status output when color.ui is set
22172 git-status -v: color diff output when color.ui is set
22174 Nanako Shiraishi (1):
22175 Document git-ls-tree --full-tree
22177 Nguyễn Thái Ngọc Duy (2):
22178 grep: support --no-ext-grep to test builtin grep
22179 grep: grep cache entries if they are "assume unchanged"
22182 objects to be pruned immediately don't have to be loosened
22185 Version v1.6.1.1; changes since v1.6.1:
22186 ---------------------------------------
22189 git-shortlog.txt: improve documentation about .mailmap files
22190 git-send-email.txt: move --format-patch paragraph to a proper location
22192 Anders Melchiorsen (4):
22193 Documentation: git push repository can also be a remote
22194 Documentation: remove a redundant elaboration
22195 Documentation: mention branches rather than heads
22196 Documentation: avoid using undefined parameters
22198 Boyd Stephen Smith Jr (1):
22199 Fix Documentation for git-describe
22201 Christian Couder (1):
22202 builtin-fsck: fix off by one head count
22204 Clemens Buchacher (4):
22205 modify/delete conflict resolution overwrites untracked file
22206 unpack-trees: handle failure in verify_absent
22207 unpack-trees: fix path search bug in verify_absent
22208 unpack-trees: remove redundant path search in verify_absent
22210 Devin Doucette (1):
22211 gitweb: Fix export check in git_get_projects_list
22213 Felipe Contreras (1):
22214 fast-import: Cleanup mode setting.
22217 Use capitalized names where appropriate
22218 Be consistent in switch usage for tar
22221 Git.pm: call Error::Simple() properly
22224 README: tutorial.txt is now called gittutorial.txt
22226 Johannes Schindelin (7):
22227 merge-recursive: mark rename/delete conflict as unmerged
22228 bisect view: call gitk if Cygwin's SESSIONNAME variable is set
22229 git add: do not add files from a submodule
22230 http-push: fix off-by-path_len
22231 http-push: when making directories, have a trailing slash in the path name
22232 t5540: clarify that http-push does not handle packed-refs on the remote
22233 Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
22235 Junio C Hamano (8):
22236 merge-recursive: do not clobber untracked working tree garbage
22237 Prepare for v1.6.1.1 maintenance release
22238 builtin-apply: prevent non-explicit permission changes
22239 git checkout: do not allow switching to a tree-ish that is not a commit
22240 format-patch: show patch text for the root commit
22241 Update draft release notes to 1.6.1.1
22242 Update draft release notes for 1.6.1.1
22245 Kirill A. Korinskiy (1):
22246 http-push: support full URI in handle_remote_ls_ctx()
22248 Lars Noschinski (1):
22249 shell: Document that 'cvs server' is a valid command
22251 Markus Heidelberg (2):
22252 doc/git-send-email: mention sendemail.cc config variable
22253 Documentation: let asciidoc align related options
22255 Michael J Gruber (2):
22256 add test cases for "git mv -k"
22257 fix handling of multiple untracked files for git mv -k
22260 fast-export: print usage when no options specified
22261 Make t3411 executable
22264 configure clobbers LDFLAGS
22266 Philippe Bruhat (1):
22267 Git.pm: correctly handle directory name that evaluates to "false"
22269 Pierre Habouzit (1):
22270 Avoid spurious error messages on error mistakes.
22273 daemon: handle freopen() failure
22274 daemon: cleanup: replace loop with if
22275 daemon: cleanup: factor out xstrdup_tolower()
22276 merge-file: handle freopen() failure
22277 pretty: factor out skip_empty_lines()
22278 pretty: factor out format_subject()
22279 pretty: support multiline subjects with format:
22280 shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
22282 Shawn O. Pearce (1):
22283 describe: Avoid unnecessary warning when using --all
22286 t3501: check that commits are actually done
22287 t3404: Add test case for aborted --continue after "edit"
22288 t3404: Add test case for auto-amending only edited commits after "edit"
22289 builtin-commit.c: do not remove COMMIT_EDITMSG
22290 githooks.txt: add missing word
22293 diff: accept -- when using --no-index
22294 diff --no-index: test for pager after option parsing
22295 diff --no-index -q: fix endless loop
22297 jidanni@jidanni.org (4):
22298 Documentation/diff-options.txt: unify options
22299 Documentation/git-tag.txt: minor typo and grammar fix
22300 Documentation/git-push.txt: minor: compress one option
22301 contrib/examples/README: give an explanation of the status of these files
22304 Version v1.6.1; changes since v1.6.1-rc4:
22305 -----------------------------------------
22307 Johannes Schindelin (1):
22308 rebase -i -p: leave a --cc patch when a merge could not be redone
22311 Show a failure of rebase -p if the merge had a conflict
22312 rebase -i -p: Fix --continue after a merge could not be redone
22314 Junio C Hamano (1):
22318 t9129: skip the last three tests if UTF-8 locale is not available
22321 Version v1.6.1-rc4; changes since v1.6.1-rc3:
22322 ---------------------------------------------
22324 Alexander Gavrilov (2):
22325 git-gui: Fix handling of relative paths in blame.
22326 git-gui: Fix commit encoding handling.
22328 Arjen Laarhoven (1):
22329 Enable threaded delta search on Mac OS X/Darwin
22331 Boyd Stephen Smith Jr (1):
22332 git-revert documentation: refer to new HOWTO on reverting faulty merges
22334 Christian Stimming (3):
22335 git-gui: Update German (completed) translation.
22336 gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
22337 gitk: Update German translation
22340 git-mergetool: properly handle "git mergetool -- filename"
22342 Fredrik Skolmli (1):
22343 git-gui: Starting translation for Norwegian
22345 Giuseppe Bilotta (1):
22346 gitk: Map / to focus the search box
22348 Johannes Schindelin (3):
22349 fast-import: close pack before unlinking it
22350 git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
22351 fast-export: deal with tag objects that do not have a tagger
22354 gitk: Use check-buttons' -text property instead of separate labels
22355 gitk: Ensure that "Reset branch" menu entry is enabled
22356 gitk: Force the focus to the main window on Windows
22358 Junio C Hamano (12):
22359 git-show: do not segfault when showing a bad tag
22360 pager: do not dup2 stderr if it is already redirected
22361 gitweb: do not run "git diff" that is Porcelain
22363 gitweb: do not run "git diff" that is Porcelain
22364 make_absolute_path(): check bounds when seeing an overlong symlink
22365 builtin-blame.c: use strbuf_readlink()
22366 combine-diff.c: use strbuf_readlink()
22367 fast-import: make tagger information optional
22368 Make sure lockfiles are unlocked when dying on SIGPIPE
22369 send-email: futureproof split_addrs() sub
22373 gitk: Allow unbalanced quotes/braces in commit headers
22375 Kirill A. Korinskiy (1):
22376 Remove the requirement opaquelocktoken uri scheme
22379 bash completion: Sort config completion variables
22380 bash completion: Sync config variables with their man pages
22382 Linus Torvalds (5):
22383 Add generic 'strbuf_readlink()' helper function
22384 Make 'ce_compare_link()' use the new 'strbuf_readlink()'
22385 Make 'index_path()' use 'strbuf_readlink()'
22386 Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'
22387 Make 'prepare_temp_file()' ignore st_size for symlinks
22389 Marcel M. Cary (1):
22390 git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir
22392 Markus Heidelberg (7):
22393 Documentation: fix description for enabling hooks
22394 doc/git-reset: add reference to git-stash
22395 Documentation: sync example output with git output
22396 Documentation: fix typos, grammar, asciidoc syntax
22397 Documentation: fix typos, grammar, asciidoc syntax
22398 Documentation/git-show-branch: work around "single quote" typesetting glitch
22399 doc/git-fsck: change the way for getting heads' SHA1s
22401 Michael J Gruber (1):
22402 test overlapping ignore patterns
22404 Michele Ballabio (1):
22405 git gui: update Italian translation
22408 git-gui: Update Hungarian translation for 0.12
22409 git-daemon documentation: use {tilde}
22410 githooks documentation: add a note about the +x mode
22411 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
22413 Nanako Shiraishi (3):
22414 git-gui: Update Japanese translation for 0.12
22415 Clarify documentation of "git checkout <tree-ish> paths" syntax
22416 Add a documentat on how to revert a faulty merge
22418 Paul Mackerras (1):
22419 gitk: Fix bugs in blaming code
22421 Peter Krefting (2):
22422 git-gui: Updated Swedish translation (515t0f0u).
22423 git-gui: Fixed typos in Swedish translation.
22426 Fix type-mismatch compiler warning from diff_populate_filespec()
22427 connect.c: stricter port validation, silence compiler warning
22428 fast-import.c: stricter strtoul check, silence compiler warning
22430 Richard Hartmann (2):
22431 Make help entries alphabetical
22432 Always show which directory is not a git repository
22434 Robin Rosenberg (1):
22435 git-revert: record the parent against which a revert was made
22437 Shawn O. Pearce (2):
22438 git-gui: Update po template to include 'Mirroring %s' message
22442 git-send-email: handle email address with quoted comma
22445 Version v1.6.1-rc3; changes since v1.6.1-rc2:
22446 ---------------------------------------------
22448 Alexander Gavrilov (1):
22449 Documentation: Describe git-gui Tools menu configuration options.
22451 Alexander Potashev (2):
22452 Fix typos in documentation
22453 Fix typo in comment in builtin-add.c
22455 Alexey Borzenkov (1):
22456 Define linkgit macro in [macros] section
22459 git-branch: display sha1 on branch deletion
22462 git-svn: Make following parents atomic
22464 Jakub Narębski (1):
22465 gitweb: Fix bug in insert_file() subroutine
22468 reorder ALLOW_TEXTCONV option setting
22469 diff: allow turning on textconv explicitly for plumbing
22470 diff: fix handling of binary rewrite diffs
22471 diff: respect textconv in rewrite diffs
22472 rebase: improve error messages about dirty state
22475 git-config.txt: fix a typo
22477 Johannes Schindelin (1):
22478 Get rid of the last remnants of GIT_CONFIG_LOCAL
22480 Junio C Hamano (4):
22481 builtin-checkout.c: check error return from read_cache()
22482 read-cache.c: typofix in comment
22483 work around Python warnings from AsciiDoc
22486 Linus Torvalds (1):
22487 fsck: reduce stack footprint
22489 Markus Heidelberg (1):
22490 builtin-commit: remove unused message variable
22493 make sure packs to be replaced are closed beforehand
22495 Ralf Wildenhues (1):
22496 Improve language in git-merge.txt and related docs
22498 Tor Arvid Lund (1):
22499 git-p4: Fix regression in p4Where method.
22501 YONETANI Tomokazu (1):
22502 git-fast-import possible memory corruption problem
22505 Version v1.6.1-rc2; changes since v1.6.1-rc1:
22506 ---------------------------------------------
22509 Make some of fwrite/fclose/write/close failures visible
22510 Make chdir failures visible
22511 Report symlink failures in merge-recursive
22513 Alexander Gavrilov (2):
22514 gitk: Make line origin search update the busy status
22515 gitk: Add a menu option to start git gui
22517 Christian Couder (2):
22518 bisect: fix "git bisect skip <commit>" and add tests cases
22519 Documentation: describe how to "bisect skip" a range of commits
22521 Christian Stimming (1):
22522 gitk: Update German translation
22524 Davide Libenzi (1):
22525 xdiff: give up scanning similar lines early
22528 git-svn: Make branch use correct svn-remote
22530 Giuseppe Bilotta (2):
22531 gitweb: make gitweb_check_feature a boolean wrapper
22532 Update comment on gitweb_check/get_feature
22534 Jakub Narębski (2):
22535 gitweb: Fix handling of non-ASCII characters in inserted HTML files
22536 gitweb: Make project specific override for 'grep' feature work
22539 add stage to gitignore
22540 tag: delete TAG_EDITMSG only on successful tag
22543 t4030-diff-textconv: Make octal escape sequence more portable
22545 Junio C Hamano (17):
22546 builtin-rm.c: explain and clarify the "local change" logic
22547 git add --intent-to-add: fix removal of cached emptiness
22548 git add --intent-to-add: do not let an empty blob be committed by accident
22549 gitweb: fix 'ctags' feature check and others
22550 gitweb: rename gitweb_check_feature to gitweb_get_feature
22551 Makefile: introduce NO_PTHREADS
22552 Install git-stage in exec-path
22553 git-am --whitespace: do not lose the command line option
22554 git-am: propagate -C<n>, -p<n> options as well
22555 git-am: propagate --3way options as well
22556 Test that git-am does not lose -C/-p/--whitespace options
22557 git-am: rename apply_opt_extra file to apply-opt
22558 Update draft release notes to 1.6.1
22560 Update draft release notes for 1.6.1
22561 Revert "git-stash: use git rev-parse -q"
22562 Point "stale" 1.6.0.5 documentation from the main git documentation page
22564 Linus Torvalds (1):
22565 Add backslash to list of 'crud' characters in real name
22568 git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.
22570 Matt McCutchen (1):
22571 "git diff <tree>{3,}": do not reverse order of arguments
22574 User's Manual: remove duplicated url at the end of Appendix B
22575 git-stash: use git rev-parse -q
22576 filter-branch: use git rev-parse -q
22577 lost-found: use git rev-parse -q
22578 pull: use git rev-parse -q
22579 rebase: use git rev-parse -q
22580 submodule: use git rev-parse -q
22581 http.c: use 'git_config_string' to get 'curl_http_proxy'
22583 Nguyễn Thái Ngọc Duy (1):
22584 Extend index to save more flags
22586 Paul Mackerras (3):
22587 gitk: Fix context menu items for generating diffs when in tree mode
22588 gitk: Highlight only when search type is "containing:".
22589 gitk: Fix bug in accessing undefined "notflag" variable
22592 Add a built-in alias for 'stage' to the 'add' command
22595 fetch-pack: Avoid memcpy() with src==dst
22597 Tor Arvid Lund (1):
22598 git-p4: Fix bug in p4Where method.
22601 Version v1.6.1-rc1; changes since v1.6.0.6:
22602 -------------------------------------------
22604 Abhijit Menon-Sen (1):
22605 Make cherry-pick use rerere for conflict resolution.
22608 Extend "checkout --track" DWIM to support more cases
22609 Remove calculation of the longest command name from where it is not used
22610 Remove useless memset of static command name lists in builtin-merge.c
22611 Make main_cmds and other_cmds local to builtin-help.c
22612 Allow git help work without PATH set
22613 list_commands: only call git_exec_path if it is needed
22614 Add help.autocorrect to enable/disable autocorrecting
22615 Cleanup remove_path
22616 Fix potentially dangerous uses of mkpath and git_path
22617 Fix handle leak in sha1_file/unpack_objects if there were damaged object data
22618 Fix t4030-diff-textconv.sh
22620 Alexander Gavrilov (58):
22621 git-gui: Support starting gitk from Gui Blame
22622 git-gui: Support passing blame to a parent commit.
22623 git-gui: Better positioning in Blame Parent Commit
22624 git-gui: Allow specifying an initial line for git gui blame.
22625 gitk: Add option to specify the default commit on command line
22626 gitk: Add menu item for calling git gui blame
22627 git-gui: Support resolving conflicts via the diff context menu.
22628 git-gui: Support calling merge tools.
22629 git-gui: Don't allow staging files with conflicts.
22630 git-gui: Support more merge tools.
22631 git-gui: Support conflict states _U & UT.
22632 git-gui: Reimplement and enhance auto-selection of diffs.
22633 git-gui: Make F5 reselect a diff, if an untracked file is selected.
22634 git-gui: Show special diffs for complex conflict cases.
22635 git-gui: Fix Blame Parent & Context for working copy lines.
22636 git-gui: Restore ability to Stage Working Copy for conflicts.
22637 gitk: Fix a bug in collapsing deeply nested trees
22638 git-gui: Add more integration options to citool.
22639 git-gui: Cleanup handling of the default encoding.
22640 git-gui: Add a menu of available encodings.
22641 git-gui: Allow forcing display encoding for diffs using a submenu.
22642 git-gui: Optimize encoding name resolution using a lookup table.
22643 git-gui: Support the encoding menu in gui blame.
22644 git-gui: Reenable staging unmerged files by clicking the icon.
22645 git-gui: Make Ctrl-T safe to use for conflicting files.
22646 git-gui: Fix the blame window shape.
22647 git-gui: Add a search command to the blame viewer.
22648 git-gui: Fix the blame viewer destroy handler.
22649 gitk: Enhance file encoding support
22650 gitk: Implement batch lookup and caching of encoding attrs
22651 gitk: Allow forcing branch creation if it already exists
22652 gitk: Fix file list context menu for merge commits
22653 builtin-blame: Reencode commit messages according to git-log rules.
22654 gitk: Allow starting gui blame for a specific line
22655 git-gui: Add a dialog that shows the OpenSSH public key.
22656 git-gui: Add a simple implementation of SSH_ASKPASS.
22657 Windows: Make OpenSSH properly detect tty detachment.
22658 gitweb: Use single implementation of export_ok check.
22659 gitweb: Add a per-repository authorization hook.
22660 gitweb: Fix mod_perl support.
22661 gitk: Add Return and Escape bindings to dialogs
22662 gitk: Make gitk dialog windows transient
22663 gitk: Make cherry-pick call git-citool on conflicts
22664 gitk: Implement a user-friendly Edit View dialog
22665 git-gui: Fix focus transition in the blame viewer.
22666 git-gui: Add the Show SSH Key item to the clone dialog.
22667 git-gui: Request blame metadata in utf-8.
22668 gitk: Add accelerators to frequently used menu commands
22669 gitk: Fix transient windows on Win32 and MacOS
22670 gitk: Fix commit encoding support
22671 Documentation: New GUI configuration and command-line options.
22672 git-gui: Implement system-wide configuration handling.
22673 git-gui: Fix the after callback execution in rescan.
22674 git-gui: Add a Tools menu for arbitrary commands.
22675 git-gui: Allow Tools request arguments from the user.
22676 git-gui: Implement automatic rescan after Tool execution.
22677 git-gui: Fix the search bar destruction handler.
22678 gitk: Avoid handling the Return key twice in Add Branch
22680 Alexandre Julliard (9):
22681 git.el: Improve error handling for commits.
22682 git.el: Remove the env parameter in git-call-process and git-call-process-string.
22683 git.el: Simplify handling of merge heads in the commit log-edit buffer.
22684 git.el: Properly handle merge commits in git-amend-commit.
22685 git.el: Fix git-amend-commit to support amending an initial commit.
22686 git.el: Never clear the status buffer, only update the files.
22687 git.el: Add an insert file command.
22688 git.el: Add possibility to mark files directly in git-update-status-files.
22689 git.el: Allow to commit even if there are no marked files.
22691 Anders Melchiorsen (2):
22692 wt-status: Split header generation into three functions
22693 wt-status: Teach how to discard changes in the working directory
22695 Andreas Ericsson (3):
22696 Teach "git diff -p" to locate PHP class methods
22697 git commit: Reformat output somewhat
22698 rebase: Support preserving merges in non-interactive mode
22700 Arjen Laarhoven (1):
22701 t6023-merge-file: Work around non-portable sed usage
22704 for-each-ref: `:short` format for `refname`
22707 remote.c: add a function for deleting a refspec array and use it (twice)
22708 dir.c: Avoid c99 array initialization
22709 t4018-diff-funcname: test syntax of builtin xfuncname patterns
22710 diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785
22711 xdiff-interface.c: strip newline (and cr) from line before pattern matching
22712 Replace xmalloc/memset(0) pairs with xcalloc
22713 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
22714 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
22715 t4018-diff-funcname: add objective-c xfuncname pattern to syntax test
22718 Make xdi_diff_outf interface for running xdiff_outf diffs
22719 Use strbuf for struct xdiff_emit_state's remainder
22720 Always initialize xpparam_t to 0
22721 Allow alternate "low-level" emit function from xdl_diff
22723 Brian Gernhardt (2):
22724 format-patch: autonumber by default
22725 Avoid using non-portable `echo -n` in tests.
22728 git-remote: match usage string with the manual pages
22729 git-remote: add verbose mode to git remote update
22731 Christian Couder (10):
22732 merge-base: teach "git merge-base" to drive underlying merge_bases_many()
22733 bisect: test merge base if good rev is not an ancestor of bad rev
22734 bisect: only check merge bases when needed
22735 bisect: remove "checkout_done" variable used when checking merge bases
22736 refs: improve comments about "reading" argument of "resolve_ref"
22737 bisect: fix missing "exit"
22738 Documentation: user-manual: add information about "git help" at the beginning
22739 Documentation: tutorial: add information about "git help" at the beginning
22740 git-gui: french translation update
22741 bisect: teach "skip" to accept special arguments like "A..B"
22743 Christian Stimming (5):
22744 git-gui: Mark forgotten strings for translation.
22745 git-gui: I18n fix sentence parts into full sentences for translation again.
22746 git-gui: Updated German translation.
22747 gitk: Add untranslated error messages to translation
22748 git-gui: Update German translation.
22751 git-merge documentation: more details about resolving conflicts
22754 Fix non-literal format in printf-style calls
22757 git-submodule: replace duplicated code with a module_list function
22758 git-submodule: add "sync" command
22759 tests: add a testcase for "git submodule sync"
22762 Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
22764 David M. Syzdek (5):
22765 Build: add NO_UINTMAX_T to support ancient systems
22766 Add Makefile check for FreeBSD 4.9-SECURITY
22767 autoconf: Add link tests to each AC_CHECK_FUNC() test
22768 Make Pthread link flags configurable
22769 Add autoconf tests for pthreads
22771 David Soria Parra (1):
22772 cast pid_t's to uintmax_t to improve portability
22775 git-diff: Add --staged as a synonym for --cached.
22777 Davide Libenzi (1):
22778 xdiff: give up scanning similar lines early
22781 git-svn: testcase for partial rebuild
22782 git-svn: do a partial rebuild if rev_map is out-of-date
22783 git-svn: proper detection of bare repositories
22784 git-svn: proper detection of bare repositories
22786 Dmitry Potapov (14):
22787 teach index_fd to work with pipes
22788 correct argument checking test for git hash-object
22789 correct usage help string for git-hash-object
22790 use parse_options() in git hash-object
22791 add --path option to git hash-object
22792 add --no-filters option to git hash-object
22793 mingw: remove use of _getdrive() from lstat/fstat
22794 add have_git_dir() function
22795 mingw: move common functionality to win32.h
22796 cygwin: Use native Win32 API for stat
22797 do not segfault if make_cache_entry failed
22798 print an error message for invalid path
22799 check-attr: add an internal check_attr() function
22800 check-attr: Add --stdin option
22803 Use xmalloc() and friends to catch allocation failures
22806 git-svn: check error code of send_txstream
22807 t9124: clean up chdir usage
22808 git-svn: fix handling of even funkier branch names
22809 git-svn: don't escape tilde ('~') for http(s) URLs
22810 git-svn: respect i18n.commitencoding config
22811 git-svn: don't escape tilde ('~') for http(s) URLs
22812 git-svn: respect i18n.commitencoding config
22814 Florian Ragwitz (1):
22815 Add git-svn branch to allow branch creation in SVN repositories
22817 Florian Weimer (3):
22818 git-svn: extract base blob in generate_diff
22819 git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob
22820 git-svn: Send deltas during commits
22822 Fredrik Skolmli (1):
22823 Documentation: Spelling fix
22826 Fixed some grammatical errors in git-rebase.txt documentation.
22828 Giovanni Funchal (1):
22829 configure: auto detect dynamic library path switches
22831 Giuseppe Bilotta (12):
22832 gitweb: ref markers link to named shortlogs
22833 gitweb: shortlog now also obeys $hash_parent
22834 gitweb: refactor input parameters parse/validation
22835 gitweb: parse project/action/hash_base:filename PATH_INFO
22836 gitweb: generate project/action/hash URLs
22837 gitweb: use_pathinfo filenames start with /
22838 gitweb: parse parent..current syntax from PATH_INFO
22839 gitweb: generate parent..current URLs
22840 gitweb: make the supported snapshot formats array global
22841 gitweb: retrieve snapshot format from PATH_INFO
22842 gitweb: embed snapshot format parameter in PATH_INFO
22843 git-gui: try to provide a window icon under X
22845 Gustaf Hendeby (2):
22846 Update .gitignore to ignore git-help
22847 git-gui: Teach git gui about file type changes
22850 diff --dirstat-by-file: count changed files, not lines
22852 Jakub Narębski (1):
22853 gitweb: Better processing format string in custom links in navbar
22856 Introduce receive.denyDeletes
22859 run-command: add pre-exec callback
22860 spawn pager via run_command interface
22861 format-patch: use default diff format even with patch options
22862 tests: grep portability fixes
22863 reformat informational commit message
22864 tutorial: update output of git commit
22865 tests: shell negation portability fix
22866 t4012: use test_cmp instead of cmp
22867 diff: unify external diff and funcname parsing code
22868 diff: introduce diff.<driver>.binary
22869 diff: add filter for converting binary to text
22870 document "intent to add" option to git-add
22871 rm: loosen safety valve for empty files
22872 submodule: fix some non-portable grep invocations
22873 diff: add missing static declaration
22874 document the diff driver textconv feature
22875 refactor userdiff textconv code
22876 userdiff: require explicitly allowing textconv
22877 only textconv regular files
22878 wt-status: load diff ui config
22879 add userdiff textconv tests
22880 enable textconv for diff in verbose status/commit
22881 t5400: expect success for denying deletion
22882 t5516: refactor oddball tests
22883 receive-pack: detect push to current branch of non-bare repo
22884 define empty tree sha1 as a macro
22885 wt-status: refactor initial commit printing
22886 status: show "-v" diff even for initial commit
22889 add boolean diff.suppress-blank-empty config option
22890 SubmittingPatches: fix a typo
22891 reword --full-index description
22892 xdiff-interface.c: remove 10 duplicated lines
22895 git-daemon: set REMOTE_ADDR to client address
22896 sha1_file: avoid bogus "file exists" error message
22899 Teach "git diff -p" HTML funcname patterns
22900 Fix AsciiDoc errors in merge documentation
22901 Fix submodule sync with relative submodule URLs
22903 Johannes Schindelin (7):
22904 t9700: remove useless check
22905 tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
22906 Enable parallel tests
22907 checkout --track: make up a sensible branch name if '-b' was omitted
22908 test-lib: do not remove trash_directory if called with --debug
22909 git wrapper: DWIM mistyped commands
22910 Document levenshtein.c
22912 Johannes Sixt (11):
22913 Revert "Windows: Use a customized struct stat that also has the st_blocks member."
22914 filter-branch: Grok special characters in tag names
22915 Windows: git-shell can be compiled again
22916 compat/mingw: Support a timeout in the poll emulation if no fds are given
22917 git-gui: Do not automatically stage file after merge tool finishes
22918 git-gui: Remove space from the end of aspell's reply before processing
22919 git-gui: Fix switch statement in lib/merge.tcl
22920 git-gui: Show a round number of bytes of large untracked text files
22921 git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
22922 git-remote: list branches in vertical lists
22923 git-gui: Do not munge conflict marker lines in a normal diff
22926 git-p4: Support purged files and optimize memory usage
22927 git-p4: Cache git config for performance
22930 git-check-attr(1): use 'verse' for multi-line synopsis sections
22932 Jonathan del Strother (3):
22933 Revert "Convert output messages in merge-recursive to past tense."
22934 Add OS X support to the pre-auto-gc example hook
22935 Teach git diff about Objective-C syntax
22937 Joshua Williams (1):
22938 git-gui: Add support for calling out to the prepare-commit-msg hook
22940 Junio C Hamano (78):
22941 builtin-add.c: restructure the code for maintainability
22942 builtin-add.c: optimize -A option and "git add ."
22943 imap-send.c: more style fixes
22944 documentation: merge-base: explain "git merge-base" with more than 2 args
22945 merge-base-many: add trivial tests based on the documentation
22946 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
22947 revision.c: whitespace fix
22948 revision traversal: show full history with merge simplification
22949 Topo-sort before --simplify-merges
22950 update-index: refuse to add working tree items beyond symlinks
22951 add: refuse to add working tree items beyond symlinks
22952 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
22953 revision --simplify-merges: use decoration instead of commit->util field
22954 index: future proof for "extended" index entries
22955 tests: use $TEST_DIRECTORY to refer to the t/ directory
22957 Makefile: Allow CC_LD_DYNPATH to be overriden
22958 revision --simplify-merges: do not leave commits unprocessed
22959 revision --simplify-merges: make it a no-op without pathspec
22960 compat: introduce on_disk_bytes()
22961 shell: do not play duplicated definition games to shrink the executable
22962 Build-in "git-shell"
22963 Update draft release notes for 1.6.1
22964 Fix "git-merge -s bogo" help text
22965 templates/Makefile: install is unnecessary, just use mkdir -p
22966 t7606: fix custom merge test
22967 Revert "Build-in "git-shell""
22968 daemon.c: minor style fixup
22969 checkout -f: allow ignoring unmerged paths when checking out of the index
22970 checkout --ours/--theirs: allow checking out one side of a conflicting merge
22971 xdl_fill_merge_buffer(): separate out a too deeply nested function
22972 xdiff-merge: optionally show conflicts in "diff3 -m" style
22973 xmerge.c: minimum readability fixups
22974 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
22975 rerere.c: use symbolic constants to keep track of parsing states
22976 rerere: understand "diff3 -m" style conflicts with the original
22977 merge.conflictstyle: choose between "merge" and "diff3 -m" styles
22978 git-merge-recursive: learn to honor merge.conflictstyle
22979 checkout -m: recreate merge when checking out of unmerged index
22980 diff: vary default prefix depending on what are compared
22981 git commit --author=$name: look $name up in existing commits
22982 git-add --intent-to-add (-N)
22983 checkout --conflict=<style>: recreate merge in a non-default style
22984 git-merge documentation: describe how conflict is presented
22985 Update draft release notes for 1.6.1
22986 safe_create_leading_directories(): make it about "leading" directories
22987 git-apply:--include=pathspec
22988 Update draft release notes for 1.6.1
22989 daemon.c: avoid setlinebuf()
22990 is_directory(): a generic helper function
22991 receive-pack: make it a builtin
22992 push: prepare sender to receive extended ref information from the receiver
22993 push: receiver end advertises refs from alternate repositories
22994 Fix git-diff-tree --stdin
22995 diff: use extended regexp to find hunk headers
22996 diff: fix "multiple regexp" semantics to find hunk header comment
22997 Update draft release notes to 1.6.1
22998 t5510: test "git fetch" following tags minimally
22999 Update draft release notes to 1.6.1
23000 Fix reading of cloud tags
23001 Update draft release notes for 1.6.1
23002 Fix mismerge at cdb22c4 in builtin-checkout.c
23003 rebase-i-p: minimum fix to obvious issues
23004 git-rebase--interactive.sh: comparision with == is bashism
23005 receive-pack: fix "borrowing from alternate object store" implementation
23006 compat/cygwin.c: make runtime detection of lstat/stat lessor impact
23007 Stop using compat/regex.c on platforms with working regexp library
23008 Update draft release notes to 1.6.1
23009 Update draft release notes to 1.6.1
23010 Update draft release notes to 1.6.1
23011 t5303: work around printf breakage in dash
23012 t5303: fix printf format string for portability
23013 git.html: Update the links to stale versions
23014 Update draft release notes to 1.6.1
23015 builtin-remote.c: plug a small memory leak in get_one_remote_for_updates()
23016 send-email: do not reverse the command line arguments
23017 Include git-gui--askpass in git-gui RPM package
23021 Refactoring: Split up diff_tree_stdin
23022 diff-tree: Note that the commit ID is printed with --stdin
23023 Teach git diff-tree --stdin to diff trees
23024 Add test for diff-tree --stdin with two trees
23026 Kirill Smelkov (1):
23027 Teach "git diff -p" Python funcname patterns
23030 bash completion: Add 'workflows' to 'git help'
23031 workflows documentation: fix link to git-request-pull[1]
23033 Linus Torvalds (8):
23034 date/time: do not get confused by fractional seconds
23035 Add a 'source' decorator for commits
23036 revision: make tree comparison functions take commits rather than trees
23037 Make '--decorate' set an explicit 'show_decorations' flag
23038 revision traversal: '--simplify-by-decoration'
23039 Add cache preload facility
23040 Fix machine-parseability of 'git log --source'
23041 Fix index preloading for racy dirty case
23043 Marcel Koeppen (1):
23044 t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible with OSX sed
23047 count-objects: Add total pack size to verbose output
23048 Update t/.gitignore to ignore all trash directories
23050 Marek Zawirski (1):
23051 Make push more verbose about illegal combination of options
23054 Documentation: rev-list-options.txt: added --branches, --tags & --remotes.
23055 git-commit.txt - mention that files listed on the command line must be known to git.
23058 git-submodule - Add 'foreach' subcommand
23059 git-submodule.sh - Remove trailing / from URL if found
23060 git-submodule.sh - Remove trailing / from URL if found
23061 git-submodule - Use "get_default_remote" from git-parse-remote
23062 compat/cygwin.c - Use cygwin's stat if core.filemode == true
23064 Markus Heidelberg (1):
23065 Makefile: add install-man rules (quick and normal)
23067 Marten Svanfeldt (dev) (2):
23068 Git.pm: Make _temp_cache use the repository directory
23069 git-svn: Update git-svn to use the ability to place temporary files within repository directory
23071 Matt McCutchen (2):
23072 "git diff <tree>{3,}": do not reverse order of arguments
23073 git-merge-recursive: honor merge.conflictstyle once again
23075 Matthias Kestenholz (1):
23076 bash-completion: Add all submodule subcommands to the completion list
23078 Michael J Gruber (3):
23079 allow installation of man and html doc from the man and html branches
23080 separate build targets for man and html documentation
23081 make prune report removed objects on -v
23083 Michael Witten (9):
23084 Docs: send-email's usage text and man page mention same options
23085 Docs: send-email usage text much sexier
23086 Docs: send-email: Man page option ordering
23087 send-email: change --no-validate to boolean --[no-]validate
23088 Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
23089 Docs: send-email: Remove unnecessary config variable description
23090 Docs: send-email: Create logical groupings for --help text
23091 Docs: send-email: Create logical groupings for man text
23092 send-email: signedoffcc -> signedoffbycc, but handle both
23094 Michele Ballabio (1):
23095 git gui: update Italian translation
23097 Mikael Magnusson (1):
23098 Correct output of git-count-objects.
23101 gitweb: Sort the list of forks on the summary page by age
23104 builtin-help: make some internal functions available to other builtins
23105 builtin-merge: allow using a custom strategy
23106 Add a new test for using a custom merge strategy
23107 Add a second testcase for handling invalid strategies in git-merge
23108 builtin-help: always load_command_list() in cmd_help()
23110 Split out merge_recursive() to merge-recursive.c
23111 merge-recursive: introduce merge_options
23112 builtin-merge: avoid run_command_v_opt() for recursive and subtree
23113 cherry-pick/revert: make direct internal call to merge_tree()
23114 merge-recursive: move call_depth to struct merge_options
23115 merge-recursive: get rid of the index_only global variable
23116 merge-recursive: move the global obuf to struct merge_options
23117 merge-recursive: move current_{file,directory}_set to struct merge_options
23118 merge-recursive: get rid of virtual_id
23119 builtin-merge: release the lockfile in try_merge_strategy()
23120 commit_tree(): add a new author parameter
23121 builtin-commit: use commit_tree()
23122 t7603: add new testcases to ensure builtin-commit uses reduce_heads()
23123 builtin-merge: refresh the index before calling a strategy
23124 builtin-commit: use reduce_heads() only when appropriate
23125 Cleanup in sha1_file.c::cache_or_unpack_entry()
23126 Implement git clone -v
23127 Add Linux PPC support to the pre-auto-gc example hook
23128 parse-opt: migrate builtin-checkout-index.
23129 Implement git remote rename
23130 remote: add a new 'origin' variable to the struct
23131 git-remote rename: migrate from remotes/ and branches/
23132 git-remote: document the migration feature of the rename subcommand
23133 Update Hungarian translation. 100% completed.
23134 builtin-branch: use strbuf in delete_branches()
23135 builtin-branch: use strbuf in fill_tracking_info()
23136 builtin-branch: use strbuf in rename_branch()
23137 builtin-clone: use strbuf in guess_dir_name()
23138 builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
23139 builtin_clone: use strbuf in cmd_clone()
23141 Nanako Shiraishi (22):
23142 t/t91XX-svn: start removing use of "git-" from these tests
23143 t/t91XX git-svn tests: run "git svn" not "git-svn"
23144 t9200: use "git cvsexportcommit" without dash
23145 t9300, t9301: use "git fast-import/fast-export" without dash
23146 t9700: use "git config" without dash
23147 tests: use "git foo" without dash in strings
23148 t9101: use "git hash-object" without dash
23149 Install git-cvsserver in $(bindir)
23150 remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.
23151 graph.c: make many functions static
23152 usage.c: remove unused functions
23153 Add contrib/rerere-train script
23154 dir.c: make dir_add_name() and dir_add_ignored() static
23155 run-command.c: remove run_command_v_opt_cd()
23156 config.c: make git_parse_long() static
23157 commit.c: make read_graft_file() static
23158 archive.c: make archiver static
23160 rebase: Document --no-verify option to bypass pre-rebase hook
23161 Document "git log --source"
23162 Document "git log --simplify-by-decoration"
23163 git-gui: update Japanese translation
23166 config.mak.in: Pass on LDFLAGS from configure
23168 Nicolas Pitre (18):
23169 sha1write: don't copy full sized buffers
23170 pack-objects: don't include missing preferred base objects
23171 t5300: improve SHA1 collision test
23172 fix openssl headers conflicting with custom SHA1 implementations
23173 index-pack: rationalize delta resolution code
23174 index-pack: smarter memory usage during delta resolution
23175 fix multiple issues in index-pack
23176 improve index-pack tests
23177 index-pack: don't leak leaf delta result
23178 close another possibility for propagating pack corruption
23179 better validation on delta base object offsets
23180 make unpack_object_header() non fatal
23181 make packed_object_info() resilient to pack corruptions
23182 make check_object() resilient to pack corruptions
23183 make find_pack_revindex() aware of the nasty world
23184 pack-objects: allow "fixing" a corrupted pack without a full repack
23185 extend test coverage for latest pack corruption resilience improvements
23186 pack-objects: don't leak pack window reference when splitting packs
23189 provide more errors for the "merge into empty head" case
23191 Paul Mackerras (17):
23192 gitk: Use <Button-2> for context menus on OSX
23193 gitk: Clean up file encoding code and add enable/disable option
23194 gitk: Fix binding for <Return> in sha1 entry field
23195 gitk: New way of constructing menus that allows for Alt+letter accelerators
23196 gitk: Regenerate .po files
23197 gitk: Turn short SHA1 names into links too
23198 gitk: Fix some off-by-one errors in computing which line to blame
23199 gitk: Add a menu item to show where a given line comes from
23200 gitk: Make the background color of marked lines configurable
23201 gitk: Unify handling of merge diffs with normal 2-way diffs
23202 gitk: Make "show origin of this line" work on fake commits
23203 gitk: Cope with unmerged files in local changes
23204 gitk: Improve cherry-pick error handling
23205 gitk: Fix linehtag undefined error with file highlighting
23206 gitk: Index line[hnd]tag arrays by id rather than row number
23207 gitk: Fix switch statement in parseviewargs
23208 gitk: Show local changes properly when we have a path limit
23211 git-svn: set auto_props when renaming files
23214 contrib/hooks/post-receive-email: Put rev display in separate function
23215 contrib/hooks/post-receive-email: Make revision display configurable
23217 Peter Krefting (1):
23218 Updated Swedish translation (514t0f0u).
23220 Peter Valdemar Mørch (2):
23221 Teach git log --check to return an appropriate exit code
23222 Teach git log --exit-code to return an appropriate exit code
23225 git-web--browse: Support for using /bin/start on MinGW
23226 git-gui: Clarify the Remote -> Delete... action
23227 git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu
23228 git-gui: Add support for adding remotes
23229 git-gui: Add support for removing remotes
23230 git-gui: mkdir -p when initializing new remote repository
23231 git-gui: Use git web--browser for web browsing
23232 git-gui: Add Explore Working Copy to the Repository menu
23233 git-gui: gui.autoexplore makes explorer to pop up automatically after picking
23234 git-gui: Avoid using the term URL when specifying repositories
23235 git-gui: Make input boxes in init/clone/open dialogs consistent
23236 git-gui: Fix removing non-pushable remotes
23237 git-gui: Fix fetching from remotes when adding them
23238 gitweb: Clean-up sorting of project list
23239 gitweb: Quote non-displayable characters in hex, not octal
23240 config.c: Tolerate UTF8 BOM at the beginning of config file
23241 gitweb: Identify all summary metadata table rows
23242 gitweb: Add support for extending the action bar with custom links
23243 gitweb: Support for tag clouds
23244 gitweb: Make the by_tag filter delve in forks as well
23245 gitweb: Support for simple project search form
23246 Do not rename read-only files during a push
23248 Pierre Habouzit (8):
23249 Enable threaded delta search on *BSD and Linux.
23250 parse-opt: migrate fmt-merge-msg.
23251 parse-opt: migrate git-merge-base.
23252 parse-opt: migrate builtin-merge-file.
23253 git send-email: make the message file name more specific.
23254 git send-email: interpret unknown files as revision lists
23255 git send-email: add --annotate option
23256 git send-email: ask less questions when --compose is used.
23259 builtin-reflog: Allow reflog expire to name partial ref
23260 builtin-commit.c: show on which branch a commit was added
23261 git wrapper: also use aliases to correct mistyped commands
23264 Update RPM spec for the new location of git-cvsserver.
23266 Ralf Wildenhues (2):
23267 Correct typos in RelNotes-1.6.1
23268 Fix typos in the documentation.
23270 Raphael Zimmerer (1):
23271 git grep: Add "-z/--null" option as in GNU's grep.
23274 log: add load_ref_decorations()
23275 move load_ref_decorations() to log-tree.c and export it
23276 add '%d' pretty format specifier to show decoration
23277 add alloc_ref_with_prefix()
23278 use alloc_ref_from_str() everywhere
23279 make alloc_ref_from_str() the new alloc_ref()
23280 blame: inline get_patch()
23281 add xdi_diff_hunks() for callers that only need hunk lengths
23282 blame: use xdi_diff_hunks(), get rid of struct patch
23283 add strbuf_expand_dict_cb(), a helper for simple cases
23284 merge-recursive: use strbuf_expand() instead of interpolate()
23285 daemon: use strbuf_expand() instead of interpolate()
23286 daemon: inline fill_in_extra_table_entries()
23287 daemon: deglobalize variable 'directory'
23288 remove the unused files interpolate.c and interpolate.h
23291 gitk: Bind Key-Return to create on new branch dialog
23293 Robert Shearman (4):
23294 git-imap-send: Allow the program to be run from subdirectories of a git tree
23295 git-imap-send: Support SSL
23296 imap-send.c: style fixes
23297 Documentation: Improve documentation for git-imap-send(1)
23299 Romain Francoise (1):
23300 builtin-help: fallback to GIT_MAN_VIEWER before man
23303 bash: use for-each-ref format 'refname:short'
23304 remove vim syntax highlighting in favor of upstream
23305 bash: complete full refs
23307 Samuel Tardieu (1):
23308 Fix deletion of last character in levenshtein distance
23311 rev-list documentation: clarify the two parts of history simplification
23313 Shawn O. Pearce (7):
23314 Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'
23315 git-gui: Hide commit related UI during citool --nocommit
23316 git-gui: Use gitattribute "encoding" for file content display
23317 git-gui: Assume `blame --incremental` output is in UTF-8
23318 git-gui: Show/hide "Sign Off" based on nocommitmsg option
23319 describe: Make --tags and --all match lightweight tags more often
23320 Update the po template
23322 Simon Hausmann (1):
23323 Make it possible to abort the submission of a change to Perforce
23326 Fix commit_tree() buffer leak
23327 merge-recursive.c: Add more generic merge_recursive_generic()
23329 Stephen Haberman (8):
23330 rebase--interactive: fix parent rewriting for dropped commits
23331 rebase-i-p: test to exclude commits from todo based on its parents
23332 rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
23333 rebase-i-p: delay saving current-commit to REWRITTEN if squashing
23334 rebase-i-p: fix 'no squashing merges' tripping up non-merges
23335 rebase-i-p: only list commits that require rewriting in todo
23336 rebase-i-p: do not include non-first-parent commits touching UPSTREAM
23337 rebase-i-p: if todo was reordered use HEAD as the rewritten parent
23339 Stephen R. van den Berg (4):
23340 git-daemon: call logerror() instead of error()
23341 git-daemon: use LOG_PID, simplify logging code
23342 git-daemon: Simplify dead-children reaping logic
23343 git-daemon: rewrite kindergarden, new option --max-connections
23346 bash completion: Add --[no-]validate to "git send-email"
23349 filter-branch: Extend test to show rewriting bug
23350 filter-branch: fix ref rewriting with --subdirectory-filter
23351 filter-branch: use --simplify-merges
23352 Documentation: rev-list-options: move --simplify-merges documentation
23353 rev-list: fix --reverse interaction with --parents
23354 t6013: replace use of 'tac' with equivalent Perl
23355 git svn: catch lack of upstream info for dcommit earlier
23356 git svn info: tests: let 'init' test run with SVN 1.5
23357 git svn info: tests: do not use set -e
23358 git svn info: tests: use test_cmp instead of git-diff
23359 git svn info: tests: fix ptouch argument order in setup
23360 git svn info: make info relative to the current directory
23361 git svn info: always quote URLs in 'info' output
23362 git-svn: match SVN 1.5 behaviour of info' on unknown item
23363 git-svn: fix 'info' tests for unknown items
23364 Documentation: new upstream rebase recovery section in git-rebase
23365 Documentation: Refer to git-rebase(1) to warn against rewriting
23366 Documentation: remove stale howto/rebase-and-edit.txt
23367 Documentation: add manpage about workflows
23369 Tom Preston-Werner (1):
23370 connect.c: add a way for git-daemon to pass an error back to client
23372 Tommi Virtanen (1):
23373 Install git-shell in bindir, too
23375 Tor Arvid Lund (1):
23376 git-p4: Fix checkout bug when using --import-local.
23379 send-email: Fix Pine address book parsing
23382 Teach/Fix pull/fetch -q/-v options
23383 Retain multiple -q/-v occurrences in git pull
23386 Version v1.6.0.6; changes since v1.6.0.5:
23387 -----------------------------------------
23390 git-mergetool: properly handle "git mergetool -- filename"
23393 git-svn: Make following parents atomic
23396 git-config.txt: fix a typo
23398 Johannes Schindelin (2):
23399 fast-import: close pack before unlinking it
23400 fast-export: deal with tag objects that do not have a tagger
23402 Junio C Hamano (6):
23403 work around Python warnings from AsciiDoc
23404 git-show: do not segfault when showing a bad tag
23405 pager: do not dup2 stderr if it is already redirected
23406 gitweb: do not run "git diff" that is Porcelain
23408 fast-import: make tagger information optional
23410 Linus Torvalds (1):
23411 fsck: reduce stack footprint
23413 Markus Heidelberg (1):
23414 Documentation: fix typos, grammar, asciidoc syntax
23417 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
23420 make sure packs to be replaced are closed beforehand
23423 git-send-email: handle email address with quoted comma
23426 Version v1.6.0.5; changes since v1.6.0.4:
23427 -----------------------------------------
23429 Alexandre Julliard (2):
23430 checkout: Don't crash when switching away from an invalid branch.
23431 git-submodule: Avoid printing a spurious message.
23433 Brandon Casey (12):
23434 t7700: demonstrate mishandling of objects in packs with a .keep file
23435 packed_git: convert pack_local flag into a bitfield and add pack_keep
23436 pack-objects: new option --honor-pack-keep
23437 repack: don't repack local objects in packs with .keep file
23438 repack: do not fall back to incremental repacking with [-a|-A]
23439 builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
23440 t7700: demonstrate mishandling of loose objects in an alternate ODB
23441 sha1_file.c: split has_loose_object() into local and non-local counterparts
23442 pack-objects: extend --local to mean ignore non-local loose objects too
23443 t7700: test that 'repack -a' packs alternate packed objects
23444 repack: only unpack-unreachable if we are deleting redundant packs
23445 revision.c: use proper data type in call to sizeof() within xrealloc
23448 Fix misleading wording for git-cherry-pick
23450 Christian Couder (3):
23451 Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"
23452 Documentation: bisect: change a few instances of "git-cmd" to "git cmd"
23453 Documentation: fix links to "everyday.html"
23456 Fix non-literal format in printf-style calls
23458 Davide Libenzi (1):
23459 xdiff: give up scanning similar lines early
23461 Jakub Narębski (1):
23462 gitweb: Make project specific override for 'grep' feature work
23465 Documentation: git-svn: fix example for centralized SVN clone
23468 commit: Fix stripping of patch in verbose mode.
23469 tag: delete TAG_EDITMSG only on successful tag
23472 sha1_file: avoid bogus "file exists" error message
23474 Johannes Schindelin (1):
23475 fast-export: use an unsorted string list for extra_refs
23478 compat/mingw.c: Teach mingw_rename() to replace read-only files
23480 Junio C Hamano (8):
23481 Makefile: help people who run 'make check' by mistake
23482 checkout: Fix "initial checkout" detection
23483 Start 1.6.0.5 cycle
23484 builtin-ls-files.c: coding style fix.
23485 Teach ls-files --with-tree=<tree> to work with options other than -c
23486 Teach "git diff" to honour --[no-]ext-diff
23487 Update draft release notes to 1.6.0.5
23490 Linus Torvalds (1):
23491 date/time: do not get confused by fractional seconds
23493 Martin Koegler (1):
23494 git push: Interpret $GIT_DIR/branches in a Cogito compatible way
23497 Remove the period after the git-check-attr summary
23499 Matt McCutchen (3):
23500 config.txt: alphabetize configuration sections
23501 git checkout: don't warn about unborn branch if -f is already passed
23502 "git diff <tree>{3,}": do not reverse order of arguments
23505 Add new testcase to show fast-export does not always exports all tags
23506 User's Manual: remove duplicated url at the end of Appendix B
23507 http.c: use 'git_config_string' to get 'curl_http_proxy'
23509 Nguyễn Thái Ngọc Duy (1):
23510 generate-cmdlist.sh: avoid selecting synopsis at wrong place
23513 Fix pack.packSizeLimit and --max-pack-size handling
23516 git-p4: fix keyword-expansion regex
23518 Ralf Wildenhues (1):
23519 Fix typos in the documentation.
23522 bash: remove dashed command leftovers
23523 bash: offer refs instead of filenames for 'git revert'
23526 sha1_file.c: resolve confusion EACCES vs EPERM
23528 Samuel Tardieu (2):
23529 tag: Check that options are only allowed in the appropriate mode
23530 tag: Add more tests about mixing incompatible modes and options
23533 git ls-remote: make usage string match manpage
23534 request-pull: make usage string match manpage
23537 fetch-pack: Avoid memcpy() with src==dst
23540 Version v1.6.0.4; changes since v1.6.0.3:
23541 -----------------------------------------
23544 Add mksnpath which allows you to specify the output buffer
23545 Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
23546 Fix potentially dangerous uses of mkpath and git_path
23547 Plug a memleak in builtin-revert
23548 Add git_snpath: a .git path formatting routine with output buffer
23549 Fix potentially dangerous use of git_path in ref.c
23550 git_pathdup: returns xstrdup-ed copy of the formatted path
23551 Use git_pathdup instead of xstrdup(git_path(...))
23552 Add --verbose|-v to test-chmtime
23553 Use test-chmtime -v instead of perl in t5000 to get mtime of a file
23555 Charles Bailey (1):
23556 git-archive: work in bare repos
23558 Christian Jaeger (1):
23559 Git.pm: do not break inheritance
23561 Clemens Buchacher (2):
23562 do not force write of packed refs
23563 push: fix local refs update if already up-to-date
23566 git-svn: change dashed git-config to git config
23567 git-svn: change dashed git-commit-tree to git commit-tree
23569 Gustaf Hendeby (1):
23570 git-gui: Help identify aspell version on Windows too
23572 Jakub Narębski (1):
23573 Documentation/gitattributes: Add subsection header for each attribute
23576 Documentation: clarify information about 'ident' attribute
23579 refactor handling of "other" files in ls-files and status
23580 correct cache_entry allocation
23581 pack-objects: avoid reading uninitalized data
23582 fix overlapping memcpy in normalize_absolute_path
23583 send-pack: do not send out single-level refs such as refs/stash
23585 Johannes Schindelin (1):
23586 Fix fetch/pull when run without --update-head-ok
23589 asciidoc: add minor workaround to add an empty line after code blocks
23591 Junio C Hamano (9):
23592 pull: allow "git pull origin $something:$current_branch" into an unborn branch
23593 Fix "checkout --track -b newbranch" on detached HEAD
23594 reset --hard/read-tree --reset -u: remove unmerged new paths
23595 demonstrate breakage of detached checkout with symbolic link HEAD
23596 Enhance hold_lock_file_for_{update,append}() API
23597 Start 1.6.0.4 cycle
23598 Update draft 1.6.0.4 release notes
23599 format-patch documentation: mention the special case of showing a single commit
23602 Linus Torvalds (1):
23603 Add file delete/create info when we overflow rename_limit
23605 Markus Heidelberg (1):
23606 bash completion: add doubledash to "git show"
23608 Mikael Magnusson (1):
23609 Document that git-log takes --all-match.
23612 Fix git branch -m for symrefs.
23613 rename_ref(): handle the case when the reflog of a ref does not exist
23614 Fix git update-ref --no-deref -d.
23615 git branch -m: forbid renaming of a symref
23616 update-ref --no-deref -d: handle the case when the pointed ref is packed
23618 Nanako Shiraishi (1):
23619 Install git-cvsserver in $(bindir)
23621 Pierre Habouzit (1):
23622 git send-email: avoid leaking directory file descriptors.
23625 Update RPM spec for the new location of git-cvsserver.
23628 add -p: warn if only binary changes present
23630 Tom Preston-Werner (1):
23631 add instructions on how to send patches to the mailing list with Gmail
23633 Tommi Virtanen (1):
23634 Install git-shell in bindir, too
23637 Add reference for status letters in documentation.
23640 Version v1.6.0.3; changes since v1.6.0.2:
23641 -----------------------------------------
23643 Abhijit Bhopatkar (1):
23644 Documentation: Clarify '--signoff' for git-commit
23647 git-svn: factor out svnserve test code for later use
23648 git-svn: Always create a new RA when calling do_switch for svn://
23651 Remove empty directories in recursive merge
23652 Add remove_path: a function to remove as much as possible of a path
23653 Use remove_path from dir.c instead of own implementation
23655 Alexander Gavrilov (1):
23656 builtin-blame: Fix blame -C -C with submodules.
23658 Björn Steinbrink (1):
23659 force_object_loose: Fix memory leak
23661 Brandon Casey (14):
23662 t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
23663 t9700/test.pl: remove File::Temp requirement
23664 diff.c: return pattern entry pointer rather than just the hunk header pattern
23665 diff.c: associate a flag with each pattern and use it for compiling regex
23666 diff.*.xfuncname which uses "extended" regex's for hunk header selection
23667 t4018-diff-funcname: test syntax of builtin xfuncname patterns
23668 builtin-prune.c: prune temporary packs in <object_dir>/pack directory
23669 git-stash.sh: don't default to refs/stash if invalid ref supplied
23670 builtin-merge.c: allocate correct amount of memory
23671 git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
23672 remote.c: correct the check for a leading '/' in a remote name
23673 t4018-diff-funcname: rework negated last expression test
23674 t4018-diff-funcname: demonstrate end of line funcname matching flaw
23675 xdiff-interface.c: strip newline (and cr) from line before pattern matching
23677 Charles Bailey (2):
23678 Add new test to demonstrate git archive core.autocrlf inconsistency
23679 Make git archive respect core.autocrlf when creating zip format archives
23682 Documentation: clarify the details of overriding LESS via core.pager
23685 contrib: update packinfo.pl to not use dashed commands
23687 Daniel Barkalow (1):
23688 Check early that a new branch is new and valid
23690 David Soria Parra (1):
23691 Solaris: Use OLD_ICONV to avoid compile warnings
23694 maint: check return of split_cmdline to avoid bad config strings
23695 git init: --bare/--shared overrides system/global config
23697 Dmitry Potapov (4):
23698 git-rebase-interactive: do not squash commits on abort
23699 git-rebase--interactive: auto amend only edited commit
23700 make prefix_path() never return NULL
23701 do not segfault if make_cache_entry failed
23704 completion: git commit should list --interactive
23707 git-svn: fix handling of even funkier branch names
23709 Fabrizio Chiarello (1):
23710 builtin-clone: fix typo
23713 Clarified gitattributes documentation regarding custom hunk header.
23715 Giuseppe Bilotta (1):
23716 gitweb: remove PATH_INFO from $my_url and $my_uri
23719 Start conforming code to "git subcmd" style part 3
23720 Cosmetical command name fix
23723 builtin-apply: fix typo leading to stack corruption
23725 Jakub Narębski (2):
23726 gitweb: Fix two 'uninitialized value' warnings in git_tree()
23727 gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh
23730 Makefile: do not set NEEDS_LIBICONV for Solaris 8
23731 git apply --directory broken for new files
23732 tests: shell negation portability fix
23735 gitweb: avoid warnings for commits without body
23738 for-each-ref: Fix --format=%(subject) for log message without newlines
23739 Use strchrnul() instead of strchr() plus manual workaround
23741 Johannes Schindelin (2):
23742 git rm: refresh index before up-to-date check
23743 rebase -i: do not fail when there is no commit to cherry-pick
23746 git-remote: do not use user input in a printf format string
23747 git-push.txt: Describe --repo option in more detail
23750 checkout: Do not show local changes when in quiet mode
23751 git-check-attr(1): add output and example sections
23753 Junio C Hamano (15):
23754 discard_cache: reset lazy name_hash bit
23755 diff Porcelain: do not disable auto index refreshing on -C -C
23756 diff --quiet: make it synonym to --exit-code >/dev/null
23757 Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
23758 Fix permission bits on sources checked out with an overtight umask
23759 checkout: do not lose staged removal
23760 diff/diff-files: do not use --cc too aggressively
23761 Start draft release notes for 1.6.0.3
23762 diff: use extended regexp to find hunk headers
23763 diff hunk pattern: fix misconverted "\{" tex macro introducers
23764 Update draft release notes to 1.6.0.3
23765 diff(1): clarify what "T"ypechange status means
23766 Hopefully the final draft release notes update before 1.6.0.3
23767 Fix testcase failure when extended attributes are in use
23770 Linus Torvalds (1):
23771 fix bogus "diff --git" header from "diff --no-index"
23774 git-svn: call 'fatal' correctly in set-tree
23776 Matt McCutchen (1):
23777 t1301-shared-repo.sh: don't let a default ACL interfere with the test
23779 Michael J Gruber (1):
23780 make "git remote" report multiple URLs
23782 Michael Prokop (1):
23783 Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
23785 Mikael Magnusson (4):
23786 Typo "bogos" in format-patch error message.
23787 git-repack uses --no-repack-object, not --no-repack-delta.
23788 Fix a few typos in relnotes
23789 Typo "does not exists" when git remote update remote.
23792 test-lib: fix color reset in say_color()
23793 Add testcase to ensure merging an early part of a branch is done properly
23795 Nanako Shiraishi (2):
23796 docs: describe pre-rebase hook
23797 Teach rebase -i to honor pre-rebase hook
23800 fix pread()'s short read in index-pack
23801 rehabilitate 'git index-pack' inside the object store
23804 Do not perform cross-directory renames when creating packs
23807 git-submodule: Fix "Unable to checkout" for the initial 'update'
23809 Rafael Garcia-Suarez (1):
23810 Clarify commit error message for unmerged files
23813 t0024: add executable permission
23814 Documentation: remove '\' in front of short options
23815 rebase -i: proper prepare-commit-msg hook argument when squashing
23816 rebase -i: remove leftover debugging
23817 bash: remove fetch, push, pull dashed form leftovers
23819 Samuel Tardieu (1):
23820 Do not use errno when pread() returns 0
23822 Shawn O. Pearce (3):
23823 Update release notes for 1.6.0.3
23824 Update release notes for 1.6.0.3
23825 test-lib: fix broken printf
23827 Stephen Haberman (1):
23828 Clarify how the user can satisfy stash's 'dirty state' check.
23831 sha1_file: link() returns -1 on failure, not errno
23833 Todd Zullinger (1):
23834 Use dashless git commands in setgitperms.perl
23837 Fix fetch/clone --quiet when stdout is connected
23840 Bust the ghost of long-defunct diffcore-pathspec.
23842 martin f. krafft (1):
23843 Improve git-log documentation wrt file filters
23846 Version v1.6.0.2; changes since v1.6.0.1:
23847 -----------------------------------------
23850 Fix use of hardlinks in "make install"
23852 Alexander Gavrilov (1):
23853 git-gui: Fix string escaping in po2msg.sh
23855 Alexandre Bourget (2):
23856 git-gui: Update french translation
23857 git-gui: update all remaining translations to French.
23859 Andreas Färber (1):
23860 Makefile: always provide a fallback when hardlinks fail
23862 Arjen Laarhoven (1):
23863 Use compatibility regex library for OSX/Darwin
23865 Ask Bjørn Hansen (1):
23866 Document sendemail.envelopesender configuration
23868 Björn Steinbrink (1):
23869 for-each-ref: Allow a trailing slash in the patterns
23871 Clemens Buchacher (2):
23872 git gui: show diffs with a minimum of 1 context line
23873 clone: fix creation of explicitly named target directory
23875 Gustaf Hendeby (1):
23876 Document clarification: gitmodules, gitattributes
23879 Start conforming code to "git subcmd" style
23880 Improve documentation for --dirstat diff option
23881 Start conforming code to "git subcmd" style part 2
23884 Fix "git log -i --grep"
23885 pretty=format: respect date format options
23886 checkout: fix message when leaving detached HEAD
23887 Use compatibility regex library also on FreeBSD
23890 Bring local clone's origin URL in line with that of a remote clone
23893 Use compatibility regex library also on AIX
23896 Fix passwd(5) ref and reflect that commit doens't use commit-tree
23898 Junio C Hamano (17):
23899 ctype.c: protect tiny C preprocessor constants
23900 shell: do not play duplicated definition games to shrink the executable
23901 Fix example in git-name-rev documentation
23902 git-apply: Loosen "match_beginning" logic
23903 checkout: do not check out unmerged higher stages randomly
23904 gitattributes: -crlf is not binary
23905 diff: Help "less" hide ^M from the output
23906 'git foo' program identifies itself without dash in die() messages
23907 Start 1.6.0.2 maintenance cycle
23908 diff --cumulative is a sub-option of --dirstat
23909 log --author/--committer: really match only with name part
23910 "blame -c" should be compatible with "annotate"
23911 Mention the fact that 'git annotate' is only for backward compatibility.
23912 stash: refresh the index before deciding if the work tree is dirty
23913 Update draft release notes for 1.6.0.2
23914 Update draft release notes for 1.6.0.2
23917 Linus Torvalds (2):
23918 index-pack: be careful after fixing up the header/footer
23919 Fix '--dirstat' with cross-directory renaming
23922 Git.pm: Use File::Temp->tempfile instead of ->new
23923 git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
23926 Makefile: add merge_recursive.h to LIB_H
23927 t7501: always use test_cmp instead of diff
23929 Nanako Shiraishi (4):
23930 tests: use "git xyzzy" form (t0000 - t3599)
23931 tests: use "git xyzzy" form (t3600 - t6999)
23932 tests: use "git xyzzy" form (t7000 - t7199)
23933 tests: use "git xyzzy" form (t7200 - t9001)
23935 Nguyễn Thái Ngọc Duy (6):
23936 index-pack: setup git repository
23937 diff*: fix worktree setup
23938 grep: fix worktree setup
23939 read-tree: setup worktree if merge is required
23940 update-index: fix worktree setup
23941 setup_git_directory(): fix move to worktree toplevel directory
23944 discard revindex data when pack list changes
23945 pack-objects: improve returned information from write_one()
23946 improve reliability of fixup_pack_header_footer()
23947 pack-objects: use fixup_pack_header_footer()'s validation mode
23948 index-pack: use fixup_pack_header_footer()'s validation mode
23949 fixup_pack_header_footer(): use nicely aligned buffer sizes
23950 improve handling of sideband message display
23953 make git-shell paranoid about closed stdin/stdout/stderr
23955 Paolo Ciarrocchi (1):
23956 tutorial: gentler illustration of Alice/Bob workflow using gitk
23959 bash completion: Hide more plumbing commands
23961 Ralf Wildenhues (1):
23962 Fix some manual typos.
23964 Ramsay Allan Jones (2):
23965 Fix a warning (on cygwin) to allow -Werror
23966 Suppress some bash redirection error messages
23969 Documentation: fix reference to a for-each-ref option
23970 Documentation: fix disappeared lines in 'git stash' manpage
23971 Documentation: minor cleanup in a use case in 'git stash' manual
23973 Shawn O. Pearce (2):
23974 pack-objects: Allow missing base objects when creating thin packs
23975 git-gui: Fix diff parsing for lines starting with "--" or "++"
23978 config.txt: Add missing colons after option name
23981 Document gitk --argscmd flag.
23984 Version v1.6.0.1; changes since v1.6.0:
23985 ---------------------------------------
23987 Alexander Gavrilov (1):
23988 Respect core.autocrlf in combined diff
23991 t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
23992 revision.h: make show_early_output an extern which is defined in revision.c
23993 compat/snprintf.c: handle snprintf's that always return the # chars transmitted
23996 mailinfo: re-fix MIME multipart boundary parsing
23999 Completion: add missing '=' for 'diff --diff-filter'
24002 git-svn: fix dcommit to urls with embedded usernames
24005 mailinfo: avoid violating strbuf assertion
24006 decorate: allow const objects to be decorated
24009 git format-patch: avoid underrun when format.headers is empty or all NLs
24010 remote.c: remove useless if-before-free test
24013 Install templates with the user and group of the installing personality
24015 Jonathan Nieder (2):
24016 Documentation: clarify pager.<cmd> configuration
24017 Documentation: clarify pager configuration
24019 Junio C Hamano (9):
24020 Start 1.6.0.X maintenance series
24021 diff --check: do not get confused by new blank lines in the middle
24022 for-each-ref: cope with tags with incomplete lines
24023 completion: find out supported merge strategies correctly
24024 "git-merge": allow fast-forwarding in a stat-dirty tree
24025 Update draft release notes for 1.6.0.1
24026 unpack_trees(): protect the handcrafted in-core index from read_cache()
24027 merge: fix numerus bugs around "trivial merge" area
24031 Fix 'git help help'
24032 Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
24034 Robert Schiele (1):
24035 adapt git-cvsserver manpage to dash-free syntax
24037 Simon Hausmann (1):
24038 Clean up the git-p4 documentation
24040 Tarmigan Casebolt (1):
24041 Add hints to revert documentation about other ways to undo changes
24043 Tor Arvid Lund (1):
24044 git-p4: Fix one-liner in p4_write_pipe function.
24047 Version v1.6.0; changes since v1.6.0-rc3:
24048 -----------------------------------------
24051 Fix t3700 on filesystems which do not support question marks in names
24053 Alexander Gavrilov (1):
24054 gitk: Allow safely calling nukefile from a run queue handler
24057 Create a specific version of the read_pipe_lines command for p4 invocations
24058 Utilise the new 'p4_read_pipe_lines' command
24059 Have a command that specifically invokes 'p4' (via system)
24060 Utilise the new 'p4_system' function.
24061 Add a single command that will be used to construct the 'p4' command
24062 If we are in verbose mode, output what we are about to run (or return)
24063 Switch to using 'p4_build_cmd'
24064 If the user has configured various parameters, use them.
24065 Consistently use 'git-p4' for the configuration entries
24066 Move git-p4.syncFromOrigin into a configuration parameters section
24067 Put some documentation in about the parameters that have been added
24068 Put in the two other configuration elements found in the source
24069 Add p4 read_pipe and write_pipe wrappers
24070 Utilise our new p4_read_pipe and p4_write_pipe wrappers
24073 test-parse-options: use appropriate cast in length_callback
24074 t5304-prune: adjust file mtime based on system time rather than file mtime
24077 Makefile: building git in cygwin 1.7.0
24080 bash completion: 'git apply' should use 'fix' not 'strip'
24082 Junio C Hamano (1):
24086 Fix escaping of glob special characters in pathspecs
24089 bash completion: Add completion for 'git mergetool'
24090 bash completion: Add '--merge' long option for 'git log'
24093 bash-completion: Add non-command git help files to bash-completion
24094 Git.pm: Make File::Spec and File::Temp requirement lazy
24096 Matt McCutchen (1):
24097 git format-patch documentation: clarify what --cover-letter does
24100 Documentation: document the pager.* configuration setting
24101 t9300: replace '!' with test_must_fail
24104 git-p4: chdir now properly sets PWD environment variable in msysGit
24106 Shawn O. Pearce (1):
24110 git-am: ignore --binary option
24111 git-stash: improve synopsis in help and manual page
24112 Improve error output of git-rebase
24115 rebase -i -p: handle index and workdir correctly
24116 rebase -i -p: fix parent rewriting
24119 Version v1.6.0-rc3; changes since v1.6.0-rc2:
24120 ---------------------------------------------
24123 Makefile: set SHELL to value of SHELL_PATH
24124 Makefile: add a target which will abort compilation with ancient shells
24127 git-svn: add ability to specify --commit-url for dcommit
24128 git-svn: wrap long lines in a few places
24130 Francis Moreau (1):
24131 git-bisect: fix wrong usage of read(1)
24133 Gustaf Hendeby (2):
24134 gitattributes: Document built in hunk header patterns
24135 Teach git diff about BibTeX head hunk patterns
24137 Ivan Stankovic (1):
24138 Documentation: fix invalid reference to 'mybranch' in user manual
24140 Johannes Schindelin (1):
24141 clone --mirror: avoid storing repeated tags
24143 Jonathan Nieder (1):
24144 Documentation: user-manual: "git commit -a" doesn't motivate .gitignore
24146 Junio C Hamano (9):
24147 asciidoc markup fixes
24148 GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files
24149 mailinfo: fix MIME multi-part message boundary handling
24150 Update draft RelNotes for 1.6.0
24151 Fix deleting reflog entries from HEAD reflog
24152 Re-fix rev-list-options documentation
24153 diff --check: do not unconditionally complain about trailing empty lines
24154 Do not talk about "diff" in rev-list documentation.
24158 Fix multi-glob assertion in git-svn
24159 git-svn: Allow deep branch names by supporting multi-globs
24160 Git.pm: Add faculties to allow temp files to be cached
24161 git-svn: Make it incrementally faster by minimizing temp files
24162 git-svn: Reduce temp file usage when dealing with non-links
24164 Nguyễn Thái Ngọc Duy (1):
24165 Fix typo in comments of longest_ancestor_length()
24168 Fail properly when cloning from invalid HTTP URL
24169 Adjust for the new way of enabling the default post-update hook
24172 builtin-rm: Add a --force flag
24173 reflog test: add more tests for 'reflog delete'
24176 bash: remove redundant check for 'git stash apply' options
24178 Stephen R. van den Berg (1):
24179 git-daemon: SysV needs the signal handler reinstated.
24182 Documentation: commit-tree: remove 16 parents restriction
24183 Documentation: filter-branch: document how to filter all refs
24184 filter-branch: be more helpful when an annotated tag changes
24185 Documentation: rev-list-options: Fix -g paragraph formatting
24186 Documentation: rev-list-options: Fix a typo
24187 Documentation: rev-list-options: Rewrite simplification descriptions for clarity
24190 Version v1.6.0-rc2; changes since v1.6.0-rc1:
24191 ---------------------------------------------
24193 Abhijit Menon-Sen (7):
24194 `git submodule add` now requires a <path>
24195 Make it clear that push can take multiple refspecs
24196 Make the DESCRIPTION match <x>... items in the SYNOPSIS
24197 Git.pm: localise $? in command_close_bidi_pipe()
24198 Fix hash slice syntax error
24199 Fix typo in perl/Git.pm
24200 Fix typos in INSTALL
24203 Make use of stat.ctime configurable
24205 Alexander Gavrilov (9):
24206 git-gui: Fix the Remote menu separator.
24207 git-gui: Preserve scroll position on reshow_diff.
24208 Support copy and rename detection in fast-export.
24209 gitk: Kill back-end processes on window close
24210 gitk: Arrange to kill diff-files & diff-index on quit
24211 gitk: On Windows, use a Cygwin-specific flag for kill
24212 gitk: Fixed broken exception handling in diff
24213 gitk: Fixed automatic row selection during load
24214 gitk: Fallback to selecting the head commit upon load
24216 Anders Melchiorsen (4):
24217 Advertise the ability to abort a commit
24218 Documentation: fix diff.external example
24219 Flush output in start_async
24220 Add output flushing before fork()
24222 Avery Pennarun (2):
24223 Teach "git diff -p" Pascal/Delphi funcname pattern
24224 git-svn: Abort with an error if 'fetch' parameter is invalid.
24227 t/t4202-log.sh: add newline at end of file
24228 Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long
24229 perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section
24231 Brian Gernhardt (1):
24232 Documentation: Remove mentions of git-svnimport.
24234 Cesar Eduardo Barros (1):
24235 Documentation/git-rev-parse.txt: update for new git-describe output format
24237 Christian Couder (2):
24238 merge-base: die with an error message if not passed a commit ref
24239 documentation: user-manual: update "using-bisect" section
24241 Christian Stimming (2):
24242 git-gui: Update German translation
24243 gitk: Updated German translation
24245 Ciaran McCreesh (1):
24246 Make git-add -i accept ranges like 7-
24248 David D. Kilzer (1):
24249 Fix race condition in t9119-git-svn-info.sh
24251 Dmitry Potapov (1):
24252 correct access right for git-svn-dcommit test
24255 git-svn: properly set path for "info" command
24256 t9119: conditionally re-enable test depending on svn(1) version
24258 Giuseppe Bilotta (2):
24259 diff: add ruby funcname pattern
24260 diff: chapter and part in funcname for tex
24263 init: handle empty "template" parameter
24264 Compact commit template message
24265 init: handle empty "template" parameter
24268 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
24270 Johannes Schindelin (3):
24271 sort_in_topological_order(): avoid setting a commit flag
24272 clone: Add an option to set up a mirror
24273 clone --bare: Add ".git" suffix to the directory name to clone into
24276 git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
24279 Fix reference to Everyday Git, which is an HTML document and not a man page.
24281 Jonathan Nieder (1):
24282 git-diff(1): "--c" -> "--cc" typo fix
24284 Junio C Hamano (19):
24285 Allow building without any git installed
24286 Allow installing in the traditional way
24287 ls-tree documentation: enhance notes on subdirectory and pathspec behaviour
24288 Documentation: clarify what is shown in "git-ls-files -s" output
24289 t7001: fix "git mv" test
24290 Teach gitlinks to ie_modified() and ce_modified_check_fs()
24291 Fix merge name generation in "merge in C"
24292 Fix test-parse-options "integer" test
24293 Teach --find-copies-harder to "git blame"
24294 make sure parsed wildcard refspec ends with slash
24295 Documentation: clarify diff --cc
24296 Update my e-mail address
24297 Start 1.5.6.5 RelNotes to describe accumulated fixes
24298 builtin-name-rev.c: split deeply nested part from the main function
24299 RelNotes 1.5.6.5 updates
24300 fix diff-tree --stdin documentation
24301 Files given on the command line are relative to $cwd
24306 format-patch: Produce better output with --inline or --attach
24309 bash completion: remove unused function _git_diff_tree
24310 bash completion: Add more long options for 'git log'
24311 bash completion: Add completion for 'git grep'
24312 bash completion: Add completion for 'git clone'
24313 bash completion: Add completion for 'git clean'
24314 bash completion: Add completion for 'git init'
24315 bash completion: Add completion for 'git revert'
24316 bash completion: More completions for 'git stash'
24317 bash completion: Add completion for 'git archive'
24318 bash completion: Add completion for 'git ls-files'
24319 bash completion: Add completion for 'git mv'
24321 Linus Torvalds (1):
24322 diff.renamelimit is a basic diff configuration
24324 Michele Ballabio (2):
24325 git-gui: update po/it.po
24326 git-gui: add a part about format strings in po/README
24328 Mikael Magnusson (2):
24329 git-gui: Update swedish translation.
24330 gitk: Update swedish translation.
24333 Documentation: typos / spelling fixes in older RelNotes
24334 Documentation: typos / spelling fixes
24336 Nanako Shiraishi (1):
24337 git-gui: update Japanese translation
24340 builtin-verify-tag: fix -v option parsing
24342 Pierre Habouzit (2):
24343 Allow "non-option" revision options in parse_option-enabled commands
24344 git-submodule: move ill placed shift.
24347 git-name-rev: allow --name-only in combination with --stdin
24350 archive: allow --exec and --remote without equal sign
24351 git-name-rev: don't use printf without format
24353 Shawn O. Pearce (2):
24354 git-gui: Fix gitk search in $PATH to work on Windows
24355 git-gui: Update git-gui.pot for 0.11 nearing release
24357 Steffen Prohaska (6):
24358 Refactor, adding prepare_git_cmd(const char **argv)
24359 run-command (Windows): Run dashless "git <cmd>"
24360 git-gui: Correct installation of library to be $prefix/share
24361 git-gui (Windows): Switch to relative discovery of oguilib
24362 git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
24363 Modify mingw_main() workaround to avoid link errors
24366 builtin-revert.c: typofix
24369 Propagate -u/--upload-pack option of "git clone" to transport.
24372 Optimize sha1_object_info for loose objects, not concurrent repacks
24374 Todd Zullinger (1):
24375 Replace uses of "git-var" with "git var"
24378 Version v1.6.0-rc1; changes since v1.6.0-rc0:
24379 ---------------------------------------------
24381 Abhijit Menon-Sen (2):
24382 git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
24383 Clarify that "git log x.c y.h" lists commits that touch either file
24386 Allow pager of diff command be enabled/disabled
24388 Alexander Gavrilov (4):
24389 Fix pre-commit hooks under MinGW/MSYS
24390 Add options to control the search for copies in blame.
24391 Kill the blame back-end on window close.
24392 Add a menu item to invoke full copy detection in blame.
24394 Anders Melchiorsen (1):
24395 Documentation: fix diff.external example
24397 Björn Steinbrink (2):
24398 index-pack.c: correctly initialize appended objects
24399 rev-parse: Add support for the ^! and ^@ syntax
24402 git-svn: teach dcommit about svn auto-props
24405 t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff
24406 t4116-apply-reverse.sh: use $TAR rather than tar
24407 t3200,t7201: replace '!' with test_must_fail
24408 t7502-commit.sh: rearrange test to make more portable
24409 t/t4202-log.sh: add newline at end of file
24410 Teach fsck and prune about the new location of temporary objects
24411 perl/Makefile: update NO_PERL_MAKEMAKER section
24413 Cesar Eduardo Barros (1):
24414 Documentation/git-submodule.txt: fix doubled word
24416 Daniel Barkalow (1):
24417 In perforce, RCS keywords are case-sensitive
24419 Jakub Narębski (1):
24420 gitweb: More about how gitweb gets 'owner' of repository
24422 Johannes Schindelin (9):
24423 Rename .git/rebase to .git/rebase-apply
24424 Rename path_list to string_list
24425 Fix two leftovers from path_list->string_list
24426 Ignore dirty submodule states in "git pull --rebase"
24427 Add test to show that show-branch misses out the 8th column
24428 sort_in_topological_order(): avoid setting a commit flag
24429 builtin-commit: Two trivial style-cleanups
24430 git daemon: avoid waking up too often
24431 Avoid chdir() in list_commands_in_dir()
24433 Johannes Sixt (12):
24434 rebase -i: When an 'edit' stops, mention the commit
24435 Makefile: Do not install a copy of 'git' in $(gitexecdir)
24436 Makefile: Normalize $(bindir) and $(gitexecdir) before comparing
24437 Record the command invocation path early
24438 Fix relative built-in paths to be relative to the command invocation
24439 Allow the built-in exec path to be relative to the command invocation path
24440 Allow add_path() to add non-existent directories to the path
24441 Windows: Make $(gitexecdir) relative
24442 Windows: Make sure argv[0] has a path
24443 Windows: Do not compile git-shell
24444 git-gui: Fix "Stage/Unstage Line" with one line of context.
24445 git-gui: "Stage Line": Treat independent changes in adjacent lines better
24447 Jonathan Nieder (3):
24448 git-diff(1): "--c" -> "--cc" typo fix
24449 document that git-tag can tag more than heads
24450 t6030 (bisect): work around Mac OS X "ls"
24452 Junio C Hamano (13):
24453 Update my e-mail address
24454 Revert "make git-status use a pager"
24455 tests: do not rely on external "patch"
24456 stash save: fix parameter handling
24457 builtin-branch.c: remove unused code in append_ref() callback function
24458 builtin-branch.c: optimize --merged and --no-merged
24459 Documentation: clarify diff --cc
24460 ignore non-existent refs in dwim_log()
24461 tests: propagate $(TAR) down from the toplevel Makefile
24462 Makefile: fix shell quoting
24463 Documentation: clarify how to disable elements in core.whitespace
24464 make sure parsed wildcard refspec ends with slash
24468 builtin-branch: remove duplicated code
24469 builtin-branch: factor out merge_filter matching
24470 builtin-branch: fix -v for --[no-]merged
24473 bash completion: Add long options for 'git rm'
24474 bash completion: Add completion for 'git help'
24477 builtin-merge: give a proper error message for invalid strategies in config
24478 t7601: extend the 'merge picks up the best result' test
24480 Nikolaj Schumacher (1):
24481 Don't cut off last character of commit descriptions.
24484 git-am: remove dash from help message
24485 parse-options: fix segmentation fault when a required value is missing
24486 git am --skip: clean the index while preserving local changes
24487 update test case to protect am --skip behaviour
24490 svnimport: newer libsvn wants us to ask for the root with "", not "/"
24492 Peter Valdemar Mørch (1):
24493 send-email: find body-encoding correctly
24496 git-filter-branch.sh: Allow running in bare repositories
24497 Documentation/git-filter-branch: teach "rm" instead of "update-index --remove"
24498 git-mv: Remove dead code branch
24499 git-mv: Keep moved index entries inact
24501 Philippe Bruhat (1):
24502 mailinfo: better parse email adresses containg parentheses
24504 Pierre Habouzit (4):
24505 builtin-merge: add missing structure initialization
24506 git-submodule: move ill placed shift.
24507 git-checkout: fix command line parsing.
24508 git-checkout: improve error messages, detect ambiguities.
24511 archive: add write_archive()
24512 archive: move parameter parsing code to archive.c
24513 archive: define MAX_ARGS where it's needed
24514 archive: declare struct archiver where it's needed
24515 archive: allow --exec and --remote without equal sign
24518 checkout: mention '--' in the docs
24519 bash: offer only paths after '--' for 'git checkout'
24521 Shawn O. Pearce (2):
24522 git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
24523 fsck: Don't require tmp_obj_ file names are 14 bytes in length
24526 git-am: Add colon before the subject that is printed out as being applied
24527 am --abort: Add to bash-completion and mention in git-rerere documentation
24528 Make non-static functions, that may be static, static
24529 Move launch_editor() from builtin-tag.c to editor.c
24530 editor.c: Libify launch_editor()
24531 git-am: Mention --abort in usage string part of OPTIONS_SPEC
24532 git-reset: Let -q hush "locally modified" messages
24535 Propagate -u/--upload-pack option of "git clone" to transport.
24536 Remove references to git-fetch-pack from "git clone" documentation.
24539 git-completion.bash: provide completion for 'show-branch'
24540 bash completion: Add long options for 'git describe'
24543 Version v1.6.0-rc0; changes since v1.5.6.6:
24544 -------------------------------------------
24546 Abhijit Menon-Sen (4):
24547 git-gui: Move on to the next filename after staging/unstaging a change
24548 git-gui: Don't select the wrong file if the last listed file is staged.
24549 Implement "git stash branch <newbranch> <stash>"
24550 Add a test for "git stash branch"
24553 Move read_revisions_from_stdin from builtin-rev-list.c to revision.c
24554 Teach git-bundle to read revision arguments from stdin like git-rev-list.
24557 Fix use of "perl -i" on Windows
24559 Alexander Gavrilov (3):
24560 Avoid rescanning unchanged entries in search for copies.
24561 Do not try to detect move/copy for entries below threshold.
24562 Support gitlinks in fast-import.
24564 Avery Pennarun (1):
24565 Reword "your branch has diverged..." lines to reduce line length
24568 t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects
24570 Brian Gernhardt (4):
24571 Fix t4017-diff-retval for white-space from wc
24572 Add test results directory to t/.gitignore
24573 Documentation: Point to gitcli(7) from git(1)
24574 Documentation: mention ORIG_HEAD in am, merge, and rebase
24576 Christian Couder (2):
24577 help: check early if we have a command, if not try a documentation topic
24578 Fix "config_error_nonbool" used with value instead of key
24580 Ciaran McCreesh (1):
24581 Make git-add -i accept ranges like 7-
24583 Cristian Peraferrer (1):
24584 Print errno upon failure to open the COMMIT_EDITMSG file
24586 Daniel Barkalow (1):
24587 Only use GIT_CONFIG in "git config", not other programs
24590 Implement normalize_absolute_path
24591 Fold test-absolute-path into test-path-utils
24592 Add support for GIT_CEILING_DIRECTORIES
24593 Eliminate an unnecessary chdir("..")
24595 Dmitry Kakurin (1):
24596 Fixed text file auto-detection: treat EOF character 032 at the end of file as printable
24598 Dmitry Potapov (4):
24599 update-hook-example: optionally allow non-fast-forward
24600 shrink git-shell by avoiding redundant dependencies
24601 completion.bash: add 'skip' and 'run' to git-bisect
24602 git-svn: fix git svn info to work without arguments
24605 git-apply: handle a patch that touches the same path more than once better
24608 user-manual: typo and grammar fixes
24609 Documentation: fix broken "linkgit" links
24612 Documentation: tweak use case in "git stash save --keep-index"
24613 completion: add branch options --contains --merged --no-merged
24614 Teach lookup_prog not to select directories
24617 t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"
24620 Testsuite: Unset CVS_SERVER
24621 testsuite for cvs co -c
24623 Frederik Schwarzer (1):
24627 tutorial: use prompt with user names in example, to clarify who is doing what
24629 Jakub Narębski (4):
24630 gitweb: Separate filling list of projects info
24631 gitweb: Separate generating 'sort by' table header
24632 t/README: Add 'Skipping Tests' section below 'Running Tests'
24633 gitweb: Describe projects_index format in more detail
24636 fix whitespace violations in test scripts
24637 mask necessary whitespace policy violations in test scripts
24638 avoid whitespace on empty line in automatic usage message
24639 avoid trailing whitespace in zero-change diffstat lines
24640 enable whitespace checking of test scripts
24641 clone: create intermediate directories of destination repo
24642 improve for-each-ref test script
24643 Allow per-command pager config
24644 avoid null SHA1 in oldest reflog
24647 Add 'git-p4.allowSubmit' to git-p4
24650 Incorporate fetched packs in future object traversal
24651 Move pack_refs() and friends into libgit
24652 Prepare testsuite for a "git clone" that packs refs
24653 Teach "git clone" to pack refs
24655 Johannes Schindelin (12):
24656 Windows: always chmod(, 0666) before unlink().
24657 commit-tree: lift completely arbitrary limit of 16 parents
24658 Allow git-apply to recount the lines in a hunk (AKA recountdiff)
24659 Add another fast-import example, this time for .zip files
24660 Teach "git apply" to prepend a prefix with "--root=<root>"
24661 git fetch-pack: do not complain about "no common commits" in an empty repo
24662 Allow cherry-picking root commits
24663 Convert CR/LF to LF in tag signatures
24664 Move MERGE_RR from .git/rr-cache/ into .git/
24665 git-gui: MERGE_RR lives in .git/ directly with newer Git versions
24666 shortlog: support --pretty=format: option
24667 Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
24669 Johannes Sixt (38):
24670 Add compat/regex.[ch] and compat/fnmatch.[ch].
24671 Compile some programs only conditionally.
24672 Add target architecture MinGW.
24673 Windows: Use the Windows style PATH separator ';'.
24674 setup.c: Prepare for Windows directory separators.
24675 Windows: Treat Windows style path names.
24676 Windows: Handle absolute paths in safe_create_leading_directories().
24677 Windows: Strip ".exe" from the program name.
24678 Windows: Implement a wrapper of the open() function.
24679 Windows: A minimal implemention of getpwuid().
24680 Windows: Work around misbehaved rename().
24681 Make my_mktime() public and rename it to tm_to_time_t()
24682 Windows: Implement gettimeofday().
24683 Windows: Fix PRIuMAX definition.
24684 Windows: Implement setitimer() and sigaction().
24685 Windows: Wrap execve so that shell scripts can be invoked.
24686 Windows: A pipe() replacement whose ends are not inherited to children.
24687 Windows: Implement start_command().
24688 Windows: A rudimentary poll() emulation.
24689 Windows: Disambiguate DOS style paths from SSH URLs.
24690 Windows: Implement asynchronous functions as threads.
24691 Windows: Work around incompatible sort and find.
24692 Windows: Implement wrappers for gethostbyname(), socket(), and connect().
24693 Windows: Implement a custom spawnve().
24694 Windows: Add a custom implementation for utime().
24695 Windows: Use a customized struct stat that also has the st_blocks member.
24696 Turn builtin_exec_path into a function.
24697 Windows: Compute the fallback for exec_path from the program invocation.
24698 Windows: Use a relative default template_dir and ETC_GITCONFIG
24699 When installing, be prepared that template_dir may be relative.
24700 Windows: Make the pager work.
24701 Windows: Work around an oddity when a pipe with no reader is written to.
24702 Windows: Make 'git help -a' work.
24703 Windows: TMP and TEMP environment variables specify a temporary directory.
24704 git-gui: Implement "Stage/Unstage Line"
24705 t4127-apply-same-fn: Avoid sed -i
24706 Provide fallback definitions of PRIu32 and PRIx32
24707 builtin-clone: rewrite guess_dir_name()
24709 Jonathan Nieder (23):
24710 Documentation: don't assume git-sh-setup and git-parse-remote are in PATH
24711 Documentation: fix links to tutorials and other new manual pages
24712 whitespace fix in Documentation/git-repack.txt
24713 Documentation: complicate example of "man git-command"
24714 git-daemon(1): don't assume git-daemon is in /usr/bin
24715 Documentation: prepare to be consistent about "git-" versus "git "
24716 Documentation: be consistent about "git-" versus "git "
24717 Documentation formatting and cleanup
24718 git-format-patch(1): fix stray \ in output
24719 Documentation: fix gitlinks
24720 manpages: fix bogus whitespace
24722 git-commit(1): depersonalize description
24723 Documentation: rewrap to prepare for "git-" vs "git " change
24724 Documentation: more "git-" versus "git " changes
24725 gitdiffcore(7): fix awkward wording
24726 manpages: italicize command names in synopses
24727 manpages: italicize command names
24728 manpages: italicize git command names (which were in teletype font)
24729 manpages: italicize gitk's name (where it was in teletype font)
24730 manpages: italicize nongit command names (if they are in teletype font)
24731 manpages: italicize git subcommand names (which were in teletype font)
24732 manpages: use teletype font for sample command lines
24735 git-svn: find-rev and rebase for SVN::Mirror repositories
24737 Junio C Hamano (65):
24738 revision traversal: --children option
24739 rev-list --children
24740 builtin-blame.c: move prepare_final() into a separate function.
24741 builtin-blame.c: allow more than 16 parents
24742 git-blame --reverse
24743 rerere: rerere_created_at() and has_resolution() abstraction
24744 git-rerere: detect unparsable conflicts
24745 rerere: remove dubious "tail_optimization"
24746 t4200: fix rerere test
24748 git-shell: accept "git foo" form
24749 Prepare execv_git_cmd() for removal of builtins from the filesystem
24750 pre-rebase hook update
24751 Ship sample hooks with .sample suffix
24752 Keep some git-* programs in $(bindir)
24753 Start draft release notes for 1.6.0
24754 diff --check: explain why we do not care whether old side is binary
24755 check_and_emit_line(): rename and refactor
24756 checkdiff: pass diff_options to the callback
24757 Teach "diff --check" about new blank lines at end
24758 diff --check: detect leftover conflict markers
24759 Update sample pre-commit hook to use "diff --check"
24760 Document the double-dash "rev -- path" disambiguator
24761 t9700: skip when Test::More is not available
24762 Update draft release notes for 1.6.0
24763 Introduce get_merge_bases_many()
24764 Introduce reduce_heads()
24765 Update draft release notes for 1.6.0
24766 apply --root: thinkofix.
24767 Refactor "tracking statistics" code used by "git checkout"
24768 git-status: show the remote tracking statistics
24769 git-branch -v: show the remote tracking statistics
24770 fast-export --export-marks: fix off by one error
24771 stat_tracking_info(): clear object flags used during counting
24772 branch -r -v: do not spit out garbage
24773 git-apply --directory: make --root more similar to GNU diff
24774 Update draft release notes for 1.6.0
24775 Teach "am" and "rebase" to mark the original position with ORIG_HEAD
24776 Tone down warning about GNU Interactive Tools
24777 Documentation: update sections on naming revisions and revision ranges
24778 branch --contains: default to HEAD
24779 branch --merged/--no-merged: allow specifying arbitrary commit
24780 apply: fix copy/rename breakage
24781 Teach merge.log to "git-merge" again
24782 Update draft release notes for 1.6.0
24783 reduce_heads(): protect from duplicate input
24784 git-rebase: report checkout failure
24785 tutorial: clarify "pull" is "fetch + merge"
24786 Update draft release notes to 1.6.0
24787 t/aggregate-results: whitespace fix
24788 Update draft release notes for 1.6.0
24789 read-cache.c: typofix
24790 mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
24791 rerere.autoupdate: change the message when autoupdate is in effect
24792 builtin-remote.c: fix earlier "skip_prefix()" conversion
24793 t9001 (send-email): Do not use hardcoded /bin/sh in test
24795 Getting closer to 1.6.0-rc0
24796 builtin-add.c: restructure the code for maintainability
24797 git-add --all: add all files
24798 git-add --all: tests
24799 git-add --all: documentation
24800 Link shell with compat layer functions
24801 Move read_in_full() and write_in_full() to wrapper.c
24802 "needs update" considered harmful
24805 Clean up builtin-update-ref's option parsing
24806 Make old sha1 optional with git update-ref -d
24809 git-send-email: Accept fifos as well as files
24811 Lars Noschinski (3):
24812 cvsserver: Add support for packed refs
24813 cvsserver: Add cvs co -c support
24814 cvsserver: Add testsuite for packed refs
24817 test-lib.sh: add --long-tests option
24818 t/test-lib.sh: add test_external and test_external_without_stderr
24819 Git.pm: add test suite
24820 gitweb: standarize HTTP status codes
24821 test-lib.sh: show git init output when in verbose mode
24822 GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy
24824 Linus Torvalds (1):
24825 Shrink the git binary a bit by avoiding unnecessary inline functions
24827 Lukas Sandström (4):
24828 Add a helper script to send patches with Mozilla Thunderbird
24829 Make some strbuf_*() struct strbuf arguments const.
24830 Add some useful functions for strbuf manipulation.
24831 git-mailinfo: use strbuf's instead of fixed buffers
24833 Marius Storm-Olsen (4):
24834 Add an optional <mode> argument to commit/status -u|--untracked-files option
24835 Add argument 'no' commit/status option -u|--untracked-files
24836 Add configuration option for default untracked files mode
24837 Windows: Add a new lstat and fstat implementation based on Win32 API.
24840 install-doc-quick - use git --exec-path to find git-sh-setup
24841 git-submodule - make "submodule add" more strict, and document it
24842 git-submodule - register submodule URL if adding in place
24844 Michele Ballabio (3):
24845 t9301-fast-export.sh: Remove debug line
24846 builtin-merge.c: Fix option parsing
24847 builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
24850 Catch failures from t5540-http-push
24852 Skip t5540-http-push test when USE_CURL_MULTI is undefined
24853 Avoid apache complaining about lack of server's FQDN
24856 We need to check for msys as well as Windows in add--interactive.
24859 A simple script to parse the results from the testcases
24860 Move split_cmdline() to alias.c
24861 Move commit_list_count() to commit.c
24862 Move parse-options's skip_prefix() to git-compat-util.h
24863 Add new test to ensure git-merge handles pull.twohead and pull.octopus
24864 Move read_cache_unmerged() to read-cache.c
24865 git-fmt-merge-msg: make it usable from other builtins
24866 Introduce get_octopus_merge_bases() in commit.c
24867 Add new test to ensure git-merge handles more than 25 refs.
24868 Add new test case to ensure git-merge reduces octopus parents when possible
24869 Retire 'stupid' merge strategy
24870 INSTALL: Update section about git-frotz form.
24871 hg-to-git: avoid raising a string exception
24872 hg-to-git: abort if the project directory is not a hg repo
24873 hg-to-git: rewrite "git-frotz" to "git frotz"
24874 hg-to-git: use git init instead of git init-db
24875 Add new test case to ensure git-merge prepends the custom merge message
24876 git-commit-tree: make it usable from other builtins
24877 Fix t7601-merge-pull-config.sh on AIX
24879 t0001-init.sh: change confusing directory name
24880 t1007-hash-object.sh: use quotes for the test description
24881 git-bisect: use dash-less form on git bisect log
24882 make remove-dashes: apply to scripts and programs as well, not just to builtins
24883 t6021: add a new test for git-merge-resolve
24884 Add a new test for git-merge-resolve
24885 Teach 'git merge' that some merge strategies no longer exist
24887 Nanako Shiraishi (7):
24888 environment.c: remove unused function
24889 config.c: make git_env_bool() static
24890 gitcli: Document meaning of --cached and --index
24891 cache-tree.c: make cache_tree_find() static
24892 builtin-describe.c: make a global variable "pattern" static
24893 parse-options.c: make check_typos() static
24896 Nguyễn Thái Ngọc Duy (1):
24897 Move all dashed-form commands to libexecdir
24899 Nicolas Pitre (11):
24900 call init_pack_revindex() lazily
24901 implement some resilience against pack corruptions
24902 test case for pack resilience against corruptions
24903 refactor pack structure allocation
24904 optimize verify-pack a bit
24905 move show_pack_info() where it belongs
24906 verify-pack: check packed object CRC when using index version 2
24907 verify-pack: test for detection of index v2 object CRC mismatch
24908 repack.usedeltabaseoffset config option now defaults to "true"
24909 pack.indexversion config option now defaults to 2
24910 restore legacy behavior for read_sha1_file()
24913 Documentation: remove {show,whatchanged}.difftree config options
24914 show_stats(): fix stats width calculation
24915 builtin-rerere: more carefully find conflict markers
24917 Patrick Higgins (1):
24918 Remove the use of '--' in merge program invocation
24921 t9600: allow testing with cvsps 2.2, including beta versions
24924 Add ANSI control code emulation for the Windows console
24927 Git.pm: Add remote_refs() git-ls-remote frontend
24928 Documentation/git-submodule.txt: Add Description section
24929 Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles
24930 Documentation/git-submodule.txt: Further clarify the description
24931 Documentation: How to ignore local changes in tracked files
24932 Documentation/git-merge.txt: Partial rewrite of How Merge Works
24934 Pierre Habouzit (13):
24935 parse-opt: have parse_options_{start,end}.
24936 parse-opt: Export a non NORETURN usage dumper.
24937 parse-opt: create parse_options_step.
24938 parse-opt: do not print errors on unknown options, return -2 intead.
24939 parse-opt: fake short strings for callers to believe in.
24940 parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
24941 revisions: split handle_revision_opt() from setup_revisions()
24942 git-blame: migrate to incremental parse-option [1/2]
24943 git-blame: migrate to incremental parse-option [2/2]
24944 parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
24945 git-blame: fix lapsus
24946 git-shortlog: migrate to parse-options partially.
24947 revisions: refactor handle_revision_opt into parse_revision_opt.
24950 builtin-fast-export: Add importing and exporting of revision marks
24952 Rafael Garcia-Suarez (1):
24953 gitweb: remove git_blame and rename git_blame2 to git_blame
24955 Ramsay Allan Jones (4):
24956 Fix some warnings (on cygwin) to allow -Werror
24957 t9113-*.sh: provide user feedback when test skipped
24958 t9100-git-svn-basic.sh: Fix determination of utf-8 locale
24959 git-request-pull: replace call to deprecated peek-remote
24962 Teach new attribute 'export-ignore' to git-archive
24963 archive: remove args member from struct archiver
24964 add context pointer to read_tree_recursive()
24965 archive: add baselen member to struct archiver_args
24966 archive: centralize archive entry writing
24967 archive: unify file attribute handling
24968 archive: remove extra arguments parsing code
24969 archive: make zip compression level independent from core git
24970 archive: remove unused headers
24973 git-gui: Fix accidental staged state toggle when clicking top pixel row
24975 Robert Shearman (1):
24976 git-send-email: Fix authenticating on some servers when using TLS.
24979 stash: introduce 'stash save --keep-index' option
24981 Shawn O. Pearce (2):
24982 Correct documentation for git-push --mirror
24983 bash completion: Remove dashed command completion support
24985 Soeren Finster (1):
24986 git-gui: Exit shortcut in MacOSX repaired
24988 Steffen Prohaska (5):
24989 Windows: Fix ntohl() related warnings about printf formatting
24990 compat/pread.c: Add a forward declaration to fix a warning
24991 Move code interpreting path relative to exec-dir to new function system_path()
24992 help.c: Add support for htmldir relative to git_exec_path()
24993 help (Windows): Display HTML in default browser using Windows' shell API
24995 Stephan Beyer (10):
24996 api-builtin.txt: update and fix typo
24997 t3404: stricter tests for git-rebase--interactive
24998 rerere: Separate libgit and builtin functions
24999 t/test-lib.sh: exit with small negagive int is ok with test_must_fail
25000 t/: Use "test_must_fail git" instead of "! git"
25001 Make usage strings dash-less
25002 git-am/git-mailsplit: correct synopsis for reading from stdin
25003 t3404: test two "preserve merges with -p" cases
25004 Make rebase--interactive use OPTIONS_SPEC
25005 Link git-shell only to a subset of libgit.a
25008 t/Makefile: use specified shell when running aggregation script
25010 Sverre Hvammen Johansen (1):
25011 reduce_heads(): thinkofix
25013 Sverre Rabbelier (2):
25014 Modify test-lib.sh to output stats to t/test-results/*
25015 Hook up the result aggregation in the test makefile.
25018 Don't use dash commands (git-foo) in tutorial-2
25021 bash: Add more option completions for 'git log'
25022 Add target "install-html" the the top level Makefile
25023 bash: Add long option completion for 'git send-email'
25026 git-send-email: add support for TLS via Net::SMTP::SSL
25027 git-send-email: prevent undefined variable warnings if no encryption is set
25028 git-add--interactive: replace hunk recounting with apply --recount
25029 git-add--interactive: remove hunk coalescing
25030 git-add--interactive: manual hunk editing mode
25031 git-send-email: Do not attempt to STARTTLS more than once
25032 Fix apply --recount handling of no-EOL line
25035 Version v1.5.6.6; changes since v1.5.6.5:
25036 -----------------------------------------
25038 Alexander Gavrilov (1):
25039 Fix quadratic performance in rewrite_one.
25042 t5304-prune: adjust file mtime based on system time rather than file mtime
25044 Francis Moreau (1):
25045 git-bisect: fix wrong usage of read(1)
25047 Ivan Stankovic (1):
25048 Documentation: fix invalid reference to 'mybranch' in user manual
25050 Junio C Hamano (8):
25051 Per-ref reflog expiry configuration
25052 Make default expiration period of reflog used for stash infinite
25053 asciidoc markup fixes
25054 Fix deleting reflog entries from HEAD reflog
25055 Re-fix rev-list-options documentation
25056 Do not talk about "diff" in rev-list documentation.
25057 gitweb: do not run "git diff" that is Porcelain
25061 Fix escaping of glob special characters in pathspecs
25063 Linus Torvalds (4):
25064 Split up default "core" config parsing into helper routine
25065 Split up default "user" config parsing into helper routine
25066 Split up default "i18n" and "branch" config parsing into helper routines
25067 Add config option to enable 'fsync()' of object files
25070 Fail properly when cloning from invalid HTTP URL
25073 reflog test: add more tests for 'reflog delete'
25076 Documentation: rev-list-options: Fix -g paragraph formatting
25079 Version v1.5.6.5; changes since v1.5.6.4:
25080 -----------------------------------------
25082 Anders Melchiorsen (1):
25083 Documentation: fix diff.external example
25085 Björn Steinbrink (1):
25086 index-pack.c: correctly initialize appended objects
25089 t/t4202-log.sh: add newline at end of file
25091 Ciaran McCreesh (1):
25092 Make git-add -i accept ranges like 7-
25095 init: handle empty "template" parameter
25098 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
25100 Johannes Schindelin (1):
25101 sort_in_topological_order(): avoid setting a commit flag
25103 Jonathan Nieder (2):
25104 fix usage string for git grep
25105 git-diff(1): "--c" -> "--cc" typo fix
25107 Junio C Hamano (12):
25108 refresh-index: fix bitmask assignment
25109 tests: propagate $(TAR) down from the toplevel Makefile
25110 Makefile: fix shell quoting
25111 make sure parsed wildcard refspec ends with slash
25112 Documentation: clarify diff --cc
25113 Update my e-mail address
25114 Start 1.5.6.5 RelNotes to describe accumulated fixes
25115 builtin-name-rev.c: split deeply nested part from the main function
25116 RelNotes 1.5.6.5 updates
25117 fix diff-tree --stdin documentation
25118 Files given on the command line are relative to $cwd
25121 Linus Torvalds (1):
25122 diff.renamelimit is a basic diff configuration
25125 Documentation: typos / spelling fixes in older RelNotes
25127 Peter Valdemar Mørch (1):
25128 send-email: find body-encoding correctly
25130 Pierre Habouzit (2):
25131 git-checkout: fix command line parsing.
25132 git-submodule: move ill placed shift.
25135 git-name-rev: allow --name-only in combination with --stdin
25138 git-name-rev: don't use printf without format
25141 builtin-revert.c: typofix
25144 Propagate -u/--upload-pack option of "git clone" to transport.
25147 Version v1.5.6.4; changes since v1.5.6.3:
25148 -----------------------------------------
25150 Dmitry Potapov (3):
25151 Fix buffer overflow in git-grep
25152 Fix buffer overflow in git diff
25153 Fix buffer overflow in prepare_attr_stack
25155 Johannes Schindelin (3):
25156 git daemon: avoid calling syslog() from a signal handler
25157 Add pretty format %aN which gives the author name, respecting .mailmap
25158 git fetch-pack: do not complain about "no common commits" in an empty repo
25161 t7600-merge: Use test_expect_failure to test option parsing
25163 Junio C Hamano (4):
25164 Start preparing 1.5.6.4 release notes
25165 rev-list: honor --quiet option
25166 http-fetch: do not SEGV after fetching a bad pack idx file
25169 Lars Noschinski (1):
25170 git-cvsserver: fix call to nonexistant cleanupWorkDir()
25172 Lukas Sandström (1):
25173 git-mailinfo: Fix getting the subject from the in-body [PATCH] line
25176 builtin-rm: fix index lock file path
25179 Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
25181 Shawn O. Pearce (9):
25182 Correct pack memory leak causing git gc to try to exceed ulimit
25183 bash completion: Improve responsiveness of git-log completion
25184 bash completion: Don't offer "a.." as a completion for "a."
25185 bash completion: Append space after file names have been completed
25186 bash completion: Resolve git show ref:path<tab> losing ref: portion
25187 index-pack: Refactor base arguments of resolve_delta into a struct
25188 index-pack: Chain the struct base_data on the stack for traversal
25189 index-pack: Track the object_entry that creates each base_data
25190 index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
25193 rebase-i: keep old parents when preserving merges
25194 api-run-command.txt: typofix
25197 Version v1.5.6.3; changes since v1.5.6.2:
25198 -----------------------------------------
25201 git-clone: remove leftover debugging fprintf().
25204 builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
25205 convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
25206 diff.c: Use 'git_config_string' to get 'diff.external'
25207 http.c: Use 'git_config_string' to clean up SSL config.
25208 builtin-commit.c: Use 'git_config_string' to get 'commit.template'
25210 Christian Couder (1):
25211 Fix "config_error_nonbool" used with value instead of key
25214 git-svn.perl: workaround assertions in svn library 1.5.0
25217 make deleting a missing ref more quiet
25219 Johannes Schindelin (1):
25220 run_command(): respect GIT_TRACE
25222 Junio C Hamano (6):
25223 attribute documentation: keep EXAMPLE at end
25224 clone -q: honor "quiet" option over native transports.
25225 mailinfo: feed the correct line length to decode_transfer_encoding()
25226 Start preparing release notes for 1.5.6.3
25227 t0004: fix timing bug
25230 Linus Torvalds (1):
25231 racy-git: an empty blob has a fixed object name
25233 Lukas Sandström (1):
25234 git-mailinfo: document the -n option
25237 git-submodule - Fix bugs in adding an existing repo as a module
25239 Matthew Ogilvie (1):
25240 Documentation cvs: Clarify when a bare repository is needed
25242 Mikael Magnusson (1):
25243 Fix grammar in git-rev-parse(1).
25245 Nikolaus Schulz (1):
25246 Documentation: be precise about which date --pretty uses
25249 Fix backwards-incompatible handling of core.sharedRepository
25252 bash: offer only paths after '--'
25254 Shawn O. Pearce (1):
25255 Remove unnecessary pack-*.keep file after successful git-clone
25258 git-am: Do not exit silently if committer is unset
25261 Version v1.5.6.2; changes since v1.5.6.1:
25262 -----------------------------------------
25264 Avery Pennarun (1):
25265 git-svn: avoid filling up the disk with temp files.
25267 Björn Steinbrink (1):
25268 git cat-file: Fix memory leak in batch mode
25271 git-svn: don't sanitize remote names in config
25274 fetch: report local storage errors in status table
25275 doc/rev-parse: clarify reflog vs --until for specifying revisions
25276 fetch: give a hint to the user when local refs fail to update
25279 avoid off-by-one error in run_upload_archive
25282 fix git config example syntax
25284 Johannes Schindelin (2):
25285 clone: respect url.insteadOf setting in global configs
25286 clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
25288 Junio C Hamano (9):
25289 Allow "git-reset path" when unambiguous
25290 diff --check: do not discard error status upon seeing a good line
25291 git-shell: accept "git foo" form
25294 Start draft release notes for 1.5.6.2
25295 Work around gcc warnings from curl headers
25296 Fix executable bits in t/ scripts
25299 Shawn O. Pearce (1):
25300 Fix describe --tags --long so it does not segfault
25303 Fix 'git show' on signed tag of signed tag of commit
25306 Version v1.5.6.1; changes since v1.5.6:
25307 ---------------------------------------
25310 git-merge.sh: fix typo in usage message: sucesses --> succeeds
25311 t7502-commit.sh: test_must_fail doesn't work with inline environment variables
25314 completion: add --graph to log command completion
25316 Dmitry Potapov (1):
25317 fix update-hook-example to work with packed tag references
25320 Documentation: fix formatting in git-svn
25321 git-svn: make rebuild respect rewriteRoot option
25324 for-each-ref: implement missing tag values
25325 clone: create intermediate directories of destination repo
25327 Junio C Hamano (2):
25328 diff -c/--cc: do not include uninteresting deletion before leading context
25331 Linus Torvalds (1):
25332 Make git_dir a path relative to work_tree in setup_work_tree()
25334 Michele Ballabio (1):
25335 parse-options.c: fix documentation syntax of optional arguments
25337 Patrick Higgins (1):
25338 Workaround for AIX mkstemp()
25341 git-rebase.sh: Add check if rebase is in progress
25342 api-builtin.txt: update and fix typo
25343 api-parse-options.txt: Introduce documentation for parse options API
25344 Extend parse-options test suite
25347 Version v1.5.6; changes since v1.5.6-rc3:
25348 -----------------------------------------
25350 Alejandro Mery (1):
25351 git-am: head -1 is obsolete and doesn't work on some new systems
25353 Christian Couder (1):
25354 Documentation: RelNotes-1.5.6: talk about renamed HTML files
25357 clean up error conventions of remote.c:match_explicit
25360 cpio is no longer used by git-clone
25361 Consistency: Use "libcurl" instead of "cURL library" and "curl"
25362 The "curl" executable is no longer required
25364 Junio C Hamano (7):
25365 Makefile: update check-docs target
25366 Update RPM spec to drop curl executable requirement
25367 diff.c: fix emit_line() again not to add extra line
25368 create_tempfile: make sure that leading directories can be accessible by peers
25369 sha1_file.c: simplify parse_pack_index()
25370 builtin-rerere: fix a small leak
25374 gitweb: quote commands properly when calling the shell
25375 gitweb: remove unused parse_ref method
25377 Linus Torvalds (1):
25378 write_loose_object: don't bother trying to read an old object
25381 run-command documentation: fix "memset()" parameter
25382 path-list documentation: document all functions and data structures
25385 Fix approxidate("never") to always return 0
25387 Pierre Habouzit (1):
25388 Make git reflog expire honour core.sharedRepository.
25391 diff: reset color before printing newline
25394 Version v1.5.6-rc3; changes since v1.5.6-rc2:
25395 ---------------------------------------------
25397 Ask Bjørn Hansen (2):
25398 gitweb setup instruction: rewrite HEAD and root as well
25399 send-email: Allow the envelope sender to be set via configuration
25401 Avery Pennarun (2):
25402 git-svn: don't append extra newlines at the end of commit messages.
25403 git-svn: test that extra blank lines aren't inserted in commit messages.
25405 Boyd Lynn Gerber (2):
25406 progress.c: avoid use of dynamic-sized array
25407 Port to 12 other Platforms.
25410 Improve sed portability
25412 Christian Couder (1):
25413 documentation: bisect: remove bits talking about a bisection branch
25415 Flavio Poletti (1):
25416 git-instaweb: improve auto-discovery of httpd and call conventions.
25419 fix typo in tutorial
25421 Geoffrey Irving (1):
25422 doc: adding gitman.info and *.texi to .gitignore
25424 Jakub Narębski (2):
25425 gitweb: Make it work with $GIT containing spaces
25426 Use 'trash directory' thoroughly in t/test-lib.sh
25429 document --pretty=tformat: option
25431 Johannes Schindelin (1):
25432 merge-recursive: respect core.autocrlf when writing out the result
25435 make_nonrelative_path: Use is_absolute_path()
25436 Remove exec bit from builtin-fast-export.c
25438 Junio C Hamano (8):
25439 http-push.c: remove duplicated code
25440 "remote prune": be quiet when there is nothing to prune
25441 Documentation/git-pull.txt: Use more standard [NOTE] markup
25442 Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
25443 user-manual: describe how higher stages are set during a merge
25444 t4126: fix test that happened to work due to timing
25445 sha1_file.c: dead code removal
25449 t1006-cat-file.sh: typo
25450 cat-file --batch / --batch-check: do not exit if hashes are missing
25451 Documentation/git-cat-file.txt: add missing line break
25452 t/.gitattributes: only ignore whitespace errors in test files
25454 Linus Torvalds (4):
25455 Consolidate SHA1 object file close
25456 Avoid cross-directory renames and linking on object creation
25457 Make loose object file reading more careful
25458 Simplify and rename find_sha1_file()
25460 Marius Storm-Olsen (1):
25461 Add testcase for merging in a CRLF repo
25464 git-submodule - Fix errors regarding resolve_relative_url
25466 Mikael Magnusson (1):
25470 Don't allocate too much memory in quote_ref_url
25473 Remove unused code in parse_commit_buffer()
25474 git-rebase -i: mention the short command aliases in the todo list
25475 git-read-tree: document -v option.
25478 remote show: fix the -n option
25479 builtin-remote: split show_or_prune() in two separate functions
25480 remote prune: print the list of pruned branches
25481 remote show: list tracked remote branches with -n
25483 Paul Mackerras (1):
25484 gitk: Handle detached heads better
25486 Philippe Bruhat (1):
25487 git-cvsimport: do not fail when CVSROOT is /
25490 git-send-email: allow whitespace in addressee list
25493 Ignore .gitattributes in bare repositories
25496 git add: add long equivalents of '-u' and '-f' options
25497 completion: add more 'git add' options
25499 Shawn O. Pearce (1):
25500 fast-export: Correctly generate initial commits with no parents
25503 git-commit.txt: Correct option alternatives
25504 git-commit.txt: Add missing long/short options
25505 Docs: Use "-l::\n--long\n" format in OPTIONS sections
25506 Docs: add some long/short options
25507 git-describe.txt: document --always
25508 git-name-rev.txt: document --no-undefined and --always
25511 Version v1.5.6-rc2; changes since v1.5.6-rc1:
25512 ---------------------------------------------
25515 graph API: fix "git log --graph --first-parent"
25516 git log --graph: print '*' for all commits, including merges
25519 Fix t5516 on cygwin: it does not like double slashes at the beginning of a path
25521 Björn Steinbrink (1):
25522 name-rev: Fix segmentation fault when using --all
25524 Christian Couder (2):
25525 documentation: convert "diffcore" and "repository-layout" to man pages
25526 documentation: move git(7) to git(1)
25528 Daniel Barkalow (1):
25529 Use nonrelative paths instead of absolute paths for cloned repositories
25531 Dirk Süsserott (1):
25532 Documentation/git-mailsplit: Enhanced description of -o option
25534 Jakub Narębski (1):
25535 gitweb: Add charset info to "raw" output of 'text/plain' blobs
25538 Fix "git clone http://$URL" to check out the worktree when asked
25540 Junio C Hamano (6):
25541 t7502: do not globally unset GIT_COMMITTER_* environment variables
25542 t7502: tighten loosely written test sequence
25543 Documentation: git-log cannot use rev-list specific options
25544 t7502: honor SHELL_PATH
25549 cat-file --batch: flush stdout also when objects are missing
25550 git-for-each-ref.txt: minor improvements
25552 Michael Dressel (1):
25553 describe: match pattern for lightweight tags too
25556 Strbuf documentation: document most functions
25559 Print info about "git help COMMAND" on git's main usage pages
25562 Version v1.5.6-rc1; changes since v1.5.6-rc0:
25563 ---------------------------------------------
25566 graph API: improve display of merge commits
25567 graph API: avoid printing unnecessary padding before some octopus merges
25569 Christian Couder (2):
25570 bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting
25571 Documentation: convert "glossary" and "core-tutorial" to man pages
25573 Christian Engwer (1):
25574 git-svn fails in prop_walk if $self->{path} is not empty
25576 Dmitry V. Levin (1):
25577 builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value
25580 Documentation/git-bundle.txt: fix synopsis
25581 commit --interactive: properly update the index before commiting
25583 Jakub Narębski (2):
25584 gitweb: Remove gitweb/test/ directory
25585 gitweb: Fix "next" link on bottom of page
25588 git-reset: honor -q and do not show progress message
25591 clone: make sure we support the transport type
25593 Johannes Schindelin (1):
25594 hg-to-git: add --verbose option
25597 t5700-clone-reference: Quote $U
25598 Revert "filter-branch: subdirectory filter needs --full-history"
25599 rebase --interactive: Compute upstream SHA1 before switching branches
25601 John J. Franey (1):
25602 Clarify description of <repository> argument to pull/fetch for naming remotes.
25604 Junio C Hamano (25):
25605 tests: do not use implicit "git diff --no-index"
25606 diff-files: do not play --no-index games
25607 "git diff": do not ignore index without --no-index
25608 Update draft release notes for 1.5.6
25609 log --graph: do not accept log --graphbogus
25610 log --pretty: do not accept bogus "--prettyshort"
25611 Release Notes for 1.5.5.2
25612 Documentation/git.txt: link to 1.5.5.2 documentation.
25613 Makefile: fix dependency on wt-status.h
25614 show-branch --current: do not barf on detached HEAD
25615 git-diff: allow --no-index semantics a bit more
25616 git diff --no-index: default to page like other diff frontends
25618 t5100: Avoid filename "nul"
25619 Git::cat_blob: allow using an empty blob to fix git-svn breakage
25620 fix sha1_pack_index_name()
25621 Manual subsection to refer to other pages is SEE ALSO
25622 Documentation: git-cherry uses git-patch-id
25623 "git checkout -- paths..." should error out when paths cannot be written
25624 checkout: make reset_clean_to_new() not die by itself
25625 checkout: consolidate reset_{to_new,clean_to_new}()
25626 unpack_trees(): allow callers to differentiate worktree errors from merge errors
25627 checkout: "best effort" checkout
25628 commit: drop duplicated parents
25632 Add some tests for git update-ref -d
25633 Fix path duplication in git svn commit-diff
25634 Revert "git.el: Set process-environment instead of invoking env"
25637 Documentation/git-filter-branch.txt: Fix description of --commit-filter
25640 gitweb: only display "next" links in logs if there is a next page
25641 t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
25642 Git.pm: fix documentation of hash_object
25643 glossary: improve a few links
25644 Git.pm: fix return value of config method
25646 Linus Torvalds (2):
25647 Make pack creation always fsync() the result
25648 Remove now unnecessary 'sync()' calls
25651 git-init: accept --bare option
25653 Marius Storm-Olsen (2):
25654 Clearify the documentation for core.ignoreStat
25655 Add shortcut in refresh_cache_ent() for marked entries.
25657 Michele Ballabio (1):
25658 Documentation: fix graph in git-rev-parse.txt
25661 Revision walking documentation: document most important functions
25664 make verify-pack a bit more useful with bad packs
25667 rollback lock files on more signals than just SIGINT
25670 builtin-fast-export: Only output a single parent per line
25673 Add a --dry-run option to git-svn rebase
25675 Shawn O. Pearce (8):
25676 git-gui: Add a --trace command line option
25677 git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
25678 Don't diff empty tree on branch creation in paranoid update hook
25679 Don't load missing ACL files in paranoid update hook
25680 Ignore no-op changes in paranoid update hook
25681 Remove unused remote_prefix member in builtin-remote
25682 Make "git-remote prune" delete refs according to fetch specs
25683 Make "git-remote rm" delete refs acccording to fetch specs
25686 Add test cases for git-am
25687 Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
25690 git-gui: Vertically align textboxes with labels
25693 Version v1.5.6-rc0; changes since v1.5.5.6:
25694 -------------------------------------------
25697 Add tests for git cat-file
25698 git-cat-file: Small refactor of cmd_cat_file
25699 git-cat-file: Make option parsing a little more flexible
25700 git-cat-file: Add --batch-check option
25701 git-cat-file: Add --batch option
25702 Move git-hash-object tests from t5303 to t1007
25703 Add more tests for git hash-object
25704 git-hash-object: Add --stdin-paths option
25705 Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
25706 Git.pm: Add hash_and_insert_object and cat_blob
25707 git-svn: Speed up fetch
25709 Adam Simpkins (11):
25710 Remove dead code: show_log() sep argument and diff_options.msg_sep
25711 log: print log entry terminator even if the message is empty
25712 revision API: split parent rewriting and parent printing options
25713 Add history graph API
25714 log and rev-list: add --graph option
25715 graph API: eliminate unnecessary indentation
25716 graph API: fix graph mis-alignment after uninteresting commits
25717 graph API: don't print branch lines for uninteresting merge parents
25718 log --graph --left-right: show left/right information in place of '*'
25719 Fix output of "git log --graph --boundary"
25720 get_revision(): honor the topo_order flag for boundary commits
25723 Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh
25724 Improve reporting of errors in config file routines
25725 Make the exit code of add_file_to_index actually useful
25726 Extend interface of add_files_to_cache to allow ignore indexing errors
25727 Add --ignore-errors to git-add to allow it to skip files with read errors
25728 Add a test for git-add --ignore-errors
25729 Add a config option to ignore errors for git-add
25730 Ensure that a test is run in the trash directory
25731 Fix t6031 on filesystems without working exec bit
25732 Fix t3701 if core.filemode disabled
25734 Anders Waldenborg (1):
25735 gitweb: Convert string to internal form before chopping in chop_str
25737 Avery Pennarun (3):
25738 git-svn: add documentation for --use-log-author option.
25739 git-svn: Add --add-author-from option.
25740 git-svn: add documentation for --add-author-from option.
25742 Bart Trojanowski (1):
25743 make git-status use a pager
25746 filter-branch.sh: support nearly proper tag name filtering
25747 compat/fopen.c: avoid clobbering the system defined fopen macro
25748 repack: modify behavior of -A option to leave unreferenced objects unpacked
25749 git-gc: always use -A when manually repacking
25750 builtin-gc.c: deprecate --prune, it now really has no effect
25751 builtin-clone.c: Need to closedir() in copy_or_link_directory()
25752 t/Makefile: "trash" directory was renamed recently
25755 git-rebase.sh: Fix --merge --abort failures when path contains whitespace
25756 config.c: Escape backslashes in section names properly
25757 git-send-email.perl: Handle shell metacharacters in $EDITOR properly
25758 test-lib.sh: Add a test_set_editor function to safely set $VISUAL
25759 Use test_set_editor in t9001-send-email.sh
25760 test-lib.sh: Fix some missing path quoting
25761 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
25762 Don't use the 'export NAME=value' in the test scripts.
25763 Fix tests breaking when checkout path contains shell metacharacters
25764 Rename the test trash directory to contain spaces.
25766 Caio Marcelo de Oliveira Filho (1):
25767 git-format-patch: add --no-binary to omit binary changes in the patch.
25770 Documentation/git-prune.txt: document unpacked logic
25771 Documentation/git-repack.txt: document new -A behaviour
25774 Updated status to show 'Not currently on any branch' in red
25776 Christian Couder (21):
25777 bisect: add "git bisect help" subcommand to get a long usage string
25778 help: use man viewer path from "man.<tool>.path" config var
25779 documentation: help: add "man.<tool>.path" config variable
25780 help: use "man.<tool>.cmd" as custom man viewer command
25781 documentation: help: add info about "man.<tool>.cmd" config var
25782 documentation: web--browse: add a note about konqueror
25783 rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"
25784 rev-parse: fix --verify to error out when passed junk after a good rev
25785 Documentation: hooks: fix missing verb in pre-applypatch description
25786 Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page
25787 Documentation: improve "add", "pull" and "format-patch" examples
25788 Documentation: bisect: add a few "git bisect run" examples
25789 rev-parse: add test script for "--verify"
25790 rev-parse: fix using "--default" with "--verify"
25791 rev-parse --verify: do not output anything on error
25792 Documentation: rev-parse: add a few "--verify" and "--default" examples
25793 bisect: add test cases to check that "git bisect start" is atomic
25794 bisect: fix left over "BISECT_START" file when starting with junk rev
25795 bisect: trap critical errors in "bisect_start"
25796 bisect: use a detached HEAD to bisect
25797 Documentation: convert tutorials to man pages
25799 Christian Stimming (3):
25800 git-gui: Update German translation
25801 gitk: Update German translation
25802 gitk: German translation again updated
25804 Clemens Buchacher (2):
25805 Reset the signal being handled
25806 http-push: remove remote locks on exit signals
25808 Clifford Caoile (1):
25809 git.el: Set process-environment instead of invoking env
25812 completion: allow 'git remote' subcommand completion
25813 completion: remove use of dashed git commands
25814 Allow cherry-pick (and revert) to add signoff line
25816 Daniel Barkalow (12):
25817 Make walker.fetch_ref() take a struct ref.
25818 Make ls-remote http://... list HEAD, like for git://...
25819 Mark the list of refs to fetch as const
25820 Add a lockfile function to append to a file
25821 Add a library function to add an alternate to the alternates file
25822 Have a constant extern refspec for "--tags"
25823 Allow for having for_each_ref() list extra refs
25824 Add a function to set a non-default work tree
25825 Provide API access to init_db()
25827 clone: fall back to copying if hardlinking fails
25828 Test that --reference actually suppresses fetching referenced objects
25830 Dmitry Potapov (1):
25831 git-init: autodetect core.ignorecase
25833 Dustin Sallings (2):
25834 Allow tracking branches to set up rebase by default.
25835 Allow tracking branches to set up rebase by default.
25838 git-svn: fix cloning of HTTP URLs with '+' in their path
25840 Frank Lichtenheld (4):
25841 var: Don't require to be in a git repository.
25842 Git.pm: Don't require a repository instance for config
25843 Git.pm: Don't require repository instance for ident
25844 send-email: Don't require to be called in a repository
25847 gitweb: fallback to system-wide config file if default config does not exist
25848 gitweb: fallback to system-wide config file (fixup)
25849 gitk: Makefile/install: force permissions when installing files and dirs
25851 Govind Salinas (1):
25852 pretty.c: add %x00 format specifier.
25854 Gustaf Hendeby (6):
25855 git-svn: Make create-ignore use git add -f
25856 Documentation: Add create-ignore to git svn manual
25857 Documentation/config.txt: Add git-gui options
25858 Documentation: Add missing git svn commands
25859 Documentation: Fix skipped section level
25860 Make git add -n and git -u -n output consistent
25863 Make core.sharedRepository more generic
25864 Document functions xmemdupz(), xread() and xwrite()
25865 Die for an early EOF in a file reading loop
25866 Make read_in_full() and write_in_full() consistent with xread() and xwrite()
25867 Cleanup xread() loops to use read_in_full()
25868 Add log.date config variable
25869 Remove redundant code, eliminate one static variable
25871 Imran M Yousuf (1):
25872 Use '-f' option to point to the .gitmodules file
25874 Jakub Narębski (1):
25875 gitweb: Use feed link according to current view
25878 add--interactive: ignore mode change in 'p'atch command
25879 add--interactive: allow user to choose mode update
25880 git-fetch: always show status of non-tracking-ref fetches
25881 git-remote: show all remotes with "git remote show"
25882 Documentation: point git-prune users to git-gc
25883 add merge.renamelimit config option
25884 bump rename limit defaults
25885 diff: make "too many files" rename warning optional
25886 fix bsd shell negation
25887 t5000: tar portability fix
25888 clone: bsd shell portability fix
25889 filter-branch: fix variable export logic
25892 Add a test for another combination of --reference
25893 Add test for cloning with "--reference" repo being a subset of source repo
25895 Johannes Schindelin (10):
25896 Provide git_config with a callback-data parameter
25897 builtin-clone: fix initial checkout
25898 cvsexportcommit: chomp only removes trailing whitespace
25899 diff options: Introduce --ignore-submodules
25900 Teach update-index about --ignore-submodules
25901 Ignore dirty submodule states during rebase and stash
25902 cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
25903 submodule update: add convenience option --init
25904 pull --rebase: exit early when the working directory is dirty
25905 mailsplit and mailinfo: gracefully handle NUL characters
25908 builtin-commit.c: Remove a redundant assignment.
25909 git-gui: Report less precise object estimates for database compression
25910 compat-util: avoid macro redefinition warning
25913 Add otherwise missing --strict option to unpack-objects summary.
25915 Junio C Hamano (24):
25916 Optimize rename detection for a huge diff
25917 t5300: add test for "unpack-objects --strict"
25918 unpack-objects: fix --strict handling
25919 rebase [--onto O] A B: omit needless checkout
25920 sha1-lookup: more memory efficient search in sorted list of SHA-1
25921 diff: make --dirstat binary-file safe
25922 sha1-lookup: make selection of 'middle' less aggressive
25923 log: teach "terminator" vs "separator" mode to "--pretty=format"
25924 git_config_bool_or_int()
25925 write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE
25926 diff-files: mark an index entry we know is up-to-date as such
25927 Fix git_config_bool_or_int
25928 First batch of post 1.5.5 updates
25929 diff: a submodule not checked out is not modified
25930 diff-lib.c: rename check_work_tree_entity()
25931 is_racy_timestamp(): do not check timestamp for gitlinks
25932 git-svn: add test for --add-author-from and --use-log-author
25933 builtin-apply: typofix
25934 builtin-apply: accept patch to an empty file
25935 builtin-apply: do not declare patch is creation when we do not know it
25936 unpack-trees: allow Porcelain to give different error messages
25937 "git-add -n -u" should not add but just report
25938 mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
25939 mailsplit: minor clean-up in read_line_with_nul()
25942 post-merge: Add it's not executed if merge failed.
25944 Krzysztof Kowalczyk (1):
25945 alloc_ref_from_str(): factor out a common pattern of alloc_ref from string
25948 Add platform-independent .git "symlink"
25949 Teach resolve_gitlink_ref() about the .git file
25950 Teach git-submodule.sh about the .git file
25951 Teach GIT-VERSION-GEN about the .git file
25952 git-branch: add support for --merged and --no-merged
25953 git-branch.txt: compare --contains, --merged and --no-merged
25954 Add tests for `branch --[no-]merged`
25955 revision.c: really honor --first-parent
25957 Linus Torvalds (12):
25958 Make unpack_trees_options bit flags actual bitfields
25959 Move name hashing functions into a file of its own
25960 Make "index_name_exists()" return the cache_entry it found
25961 Make hash_name_lookup able to do case-independent lookups
25962 Add 'core.ignorecase' option
25963 Make branch merging aware of underlying case-insensitive filsystems
25964 Make unpack-tree update removed files before any updated files
25965 When adding files to the index, add support for case-independent matches
25966 Make git-add behave more sensibly in a case-insensitive environment
25967 Optimize match_pathspec() to avoid fnmatch()
25968 Avoid some unnecessary lstat() calls
25969 Optimize symlink/directory detection
25972 Documentation on --git-dir and --work-tree
25974 Marcel Koeppen (2):
25975 Replace in-place sed in t7502-commit
25976 Fix prepare-commit-msg hook and replace in-place sed
25979 Be more careful with objects directory permissions on clone
25981 Martin Koegler (3):
25982 unpack-objects: prevent writing of inconsistent objects
25983 receive-pack: allow using --strict mode for unpacking objects
25984 t5300: add test for "index-pack --strict"
25986 Matthew Ogilvie (3):
25987 git-cvsserver: add mechanism for managing working tree and current directory
25988 implement gitcvs.usecrlfattr
25989 git-cvsserver: add ability to guess -kb from contents
25991 Matthias Kestenholz (1):
25992 Use color.ui variable in scripts too
25995 git-svn: detect and fail gracefully when dcommitting to a void
25997 Michele Ballabio (4):
25998 gitk: Disable "Reset %s branch to here" when on a detached head
25999 gitk: Move es.po where it belongs
26000 builtin-cat-file.c: use parse_options()
26001 change quoting in test t1006-cat-file.sh
26004 Makefile: update the default build options for AIX
26007 git-gc --auto: add pre-auto-gc hook
26008 Documentation/hooks: add pre-auto-gc hook
26009 contrib/hooks: add an example pre-auto-gc hook
26010 git checkout: add -t alias for --track
26011 git-format-patch: add a new format.cc configuration variable
26012 git-send-email: add a new sendemail.cc configuration variable
26013 Add tests for sendemail.cc configuration variable
26014 INSTALL: add a note about GNU interactive tools has been renamed
26015 git-fast-import: rename cmd_*() functions to parse_*()
26016 git-merge: exclude unnecessary options from OPTIONS_SPEC
26017 CodingGuidelines: Add a note to avoid assignments inside if()
26020 pack-objects: small cleanup
26021 pack-objects: remove some double negative logic
26022 pack-objects: simplify the condition associated with --all-progress
26023 pack-objects: clean up write_object() a bit
26024 pack-objects: move compression code in a separate function
26025 pack-objects: allow for early delta deflating
26026 pack-objects: fix early eviction for max depth delta objects
26027 add a force_object_loose() function
26028 let pack-objects do the writing of unreachable objects as loose objects
26031 Add a remote.*.mirror configuration option
26032 add special "matching refs" refspec
26034 Paul Mackerras (40):
26035 gitk: Use git log without --topo-order and reorganize the commits ourselves
26036 gitk: Fix bug in assigning row numbers to arcs
26037 gitk: Fix bug in parsing multiple revision arguments
26038 gitk: Compute row numbers and order tokens lazily
26039 gitk: Fix a couple of bugs
26040 gitk: Fix more bugs resulting in Tcl "no such element in array" errors
26041 gitk: More bug fixes and cleanups
26042 gitk: Implement date mode in the new framework
26043 gitk: Fix another collection of bugs
26044 gitk: Don't try to show local changes from a head that isn't shown
26045 gitk: Keep the same commits visible as other commits come in
26046 gitk: Fix some corner cases in the targetid/targetrow stuff
26047 gitk: Fix a couple of bugs in the find function
26048 gitk: Fix potential bug with fake commit IDs in renumbervarc
26049 gitk: Index [fnvr]highlights by id rather than row
26050 gitk: Fix handling of flag arguments
26051 gitk: Fix a bug in make_disporder
26052 gitk: Select head of current branch by default
26053 gitk: Select something appropriate on cherry-pick, branch reset and checkout
26054 gitk: Fix bug where editing an existing view would cause an infinite loop
26055 gitk: Fix bug causing Tcl error when no commits are selected
26056 gitk: Fix cherry-picking to insert a real row not a fake row
26057 gitk: Cope better with getting commits that we have already seen
26058 gitk: Fix bug where arcs could get lost
26059 gitk: Handle updating with path limiting better
26060 gitk: Fix problems with target row stuff
26061 gitk: Don't filter view arguments through git rev-parse
26062 gitk: Correct a few strings and comments to say "git log"
26063 gitk: Fix some corner cases in computing vrowmod and displayorder
26064 gitk: Avoid a crash in selectline if commitinfo($id) isn't set
26065 gitk: Fix problem with target row not being in scroll region
26066 gitk: Reorganize processing of arguments for git log
26067 gitk: Fix handling of tree file list with special chars in names
26068 gitk: Make updates go faster
26069 gitk: Synchronize highlighting in file view for 'f' and 'b' commands
26070 gitk: Show current row number and total number of rows
26071 gitk: Add a progress bar for checking out a head
26072 gitk: Fix "wrong # coordinates" error on reload
26073 gitk: Fix bug where current row number display stops working
26074 gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
26077 Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.
26079 Peter Krefting (1):
26080 gitk: Initial Swedish translation.
26083 git-submodule summary: --for-status option
26084 builtin-status: submodule summary support
26085 builtin-status: Add tests for submodule summary
26086 t4027: test diff for submodule with empty directory
26087 Add t7506 to test submodule related functions for git-status
26089 Rafael Garcia-Suarez (1):
26090 Spelling fixes in the gitweb documentation
26093 bash: Add completion for gitk --merge
26094 Documentation gitk: Describe what --merge does
26097 doc: moved merge.* config variables into separate merge-config.txt
26098 merge, pull: introduce '--(no-)stat' option
26099 add 'merge.stat' config variable
26100 fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
26101 merge, pull: add '--(no-)log' command line option
26104 Preparation to call determine_author_info from prepare_to_commit
26105 commit: Show author if different from committer
26106 commit: Show committer if automatic
26109 gitk: Spanish translation of gitk
26111 Sebastian Schuberth (1):
26112 mergetool: Make ECMerge use the settings as specified by the user in the GUI
26114 Shawn O. Pearce (3):
26115 git-gui: Don't use '$$cr master' with aspell earlier than 0.60
26116 git-gui: Setup branch.remote,merge for shorthand git-pull
26117 git-gui: Delete branches with 'git branch -D' to clear config
26119 Steffen Prohaska (4):
26120 t0050: Test autodetect core.ignorecase
26121 t0050: Set core.ignorecase case to activate case insensitivity
26122 t0050: Add test for case insensitive add
26123 t0050: Fix merge test on case sensitive file systems
26126 builtin-apply.c: use git_config_string() to get apply_default_whitespace
26128 Stephen R. van den Berg (2):
26129 Simplify and fix --first-parent implementation
26130 git-svn: Same default as cvsimport when using --use-log-author
26133 Add svn-compatible "blame" output format to git-svn
26136 Documentation/git-web--browse.txt: fix small typo
26139 gitk: Allow users to view diffs in external diff viewer
26142 cvsexportcommit: Create config option for CVS dir
26145 Version v1.5.5.6; changes since v1.5.5.5:
26146 -----------------------------------------
26148 Junio C Hamano (2):
26149 gitweb: do not run "git diff" that is Porcelain
26153 Version v1.5.5.5; changes since v1.5.5.4:
26154 -----------------------------------------
26157 fix typo in tutorial
26160 Remove exec bit from builtin-fast-export.c
26162 Junio C Hamano (4):
26163 diff.c: fix emit_line() again not to add extra line
26164 git-shell: accept "git foo" form
26169 git-read-tree: document -v option.
26172 diff: reset color before printing newline
26175 Version v1.5.5.4; changes since v1.5.5.3:
26176 -----------------------------------------
26178 Björn Steinbrink (1):
26179 name-rev: Fix segmentation fault when using --all
26181 Junio C Hamano (1):
26185 git-for-each-ref.txt: minor improvements
26187 Michael Dressel (1):
26188 describe: match pattern for lightweight tags too
26191 Version v1.5.5.3; changes since v1.5.5.2:
26192 -----------------------------------------
26194 Christian Couder (1):
26195 bisect: print an error message when "git rev-list --bisect-vars" fails
26198 git-bisect.sh: don't accidentally override existing branch "bisect"
26199 Documentation/git-bundle.txt: fix synopsis
26200 commit --interactive: properly update the index before commiting
26202 Horst H. von Brand (1):
26203 Fix recipient santitization
26206 send-email: specify content-type of --compose body
26207 send-email: rfc2047-quote subject lines with non-ascii characters
26210 Revert "filter-branch: subdirectory filter needs --full-history"
26212 Junio C Hamano (3):
26213 Release Notes for 1.5.5.2
26214 show-branch --current: do not barf on detached HEAD
26218 gitweb: only display "next" links in logs if there is a next page
26220 Michele Ballabio (1):
26221 Documentation: fix graph in git-rev-parse.txt
26224 builtin-fast-export: Only output a single parent per line
26227 Version v1.5.5.2; changes since v1.5.5.1:
26228 -----------------------------------------
26230 A Large Angry SCM (1):
26231 git-repack: re-enable parsing of -n command line option
26234 Use "=" instead of "==" in condition as it is more portable
26235 Fix use after free() in builtin-fetch
26238 post-receive-email: fix accidental removal of a trailing space in signature line
26241 copy.c: copy_fd - correctly report write errors
26242 archive.c: format_subst - fixed bogus argument to memchr
26245 git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc
26248 Remove 'header' from --signoff option description
26250 Dmitry Potapov (1):
26251 git-gc --prune is deprecated
26253 Dustin Sallings (1):
26254 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
26256 Florian Ragwitz (1):
26257 filter-branch: Documentation fix.
26260 diff-options.txt: document the new "--dirstat" option
26263 Add missing "short" alternative to --date in rev-list-options.txt
26266 Documentation/git-describe.txt: make description more readable
26269 Don't force imap.host to be set when imap.tunnel is set
26270 t5516: remove ambiguity test (1)
26271 doc/git-gc: add a note about what is collected
26272 push: allow unqualified dest refspecs to DWIM
26273 remote: create fetch config lines with '+'
26274 fix reflog approxidate parsing bug
26275 cvsimport: always pass user data to "system" as a list
26276 checkout: don't rfc2047-encode oneline on detached HEAD
26277 doc: clarify definition of "update" for git-add -u
26278 doc/git-daemon: s/uploadarchive/uploadarch/
26279 git-am: fix typo in usage message
26282 wt-status.h: declare global variables as extern
26283 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
26286 git-filter-branch: Clarify file removal example.
26287 git-show.txt: Not very stubby these days.
26289 Junio C Hamano (3):
26290 write-tree: properly detect failure to write tree objects
26291 clone: detect and fail on excess parameters
26292 fetch-pack: brown paper bag fix
26294 Linus Torvalds (1):
26295 fetch-pack: do not stop traversing an already parsed commit
26298 Linked glossary from cvs-migration page
26300 Matthew Ogilvie (1):
26301 gitattributes: Fix subdirectory attributes specified from root directory
26304 svn-git: Use binmode for reading/writing binary rev maps
26307 diff options documentation: refer to --diff-filter in --name-status
26310 Amend git-push refspec documentation
26312 Shawn O. Pearce (1):
26313 Clarify repack -n documentation
26315 Sitaram Chamarty (1):
26316 builtin-commit.c: add -u as short name for --untracked-files
26319 bash: Add completion for git diff --base --ours --theirs
26321 Thomas Guyot-Sionnest (1):
26322 git-svn bug with blank commits and author file
26324 martin f. krafft (2):
26325 Escape project name in regexp
26326 Escape project names before creating pathinfo URLs
26329 Version v1.5.5.1; changes since v1.5.5:
26330 ---------------------------------------
26332 Alberto Bertogli (1):
26333 builtin-apply: Show a more descriptive error on failure when opening a patch
26335 Björn Steinbrink (1):
26336 Fix section about backdating tags in the git-tag docs
26339 Fix documentation syntax of optional arguments in short options.
26340 core-tutorial.txt: Fix showing the current behaviour.
26342 Christian Couder (4):
26343 bisect: fix bad rev checking in "git bisect good"
26344 bisect: report bad rev better
26345 bisect: squelch "fatal: ref HEAD not a symref" misleading message
26346 git-bisect: make "start", "good" and "skip" succeed or fail atomically
26348 Clifford Caoile (1):
26349 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
26351 Daniel Barkalow (1):
26352 Fix config key miscount in url.*.insteadOf
26354 Dirk Süsserott (1):
26355 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
26357 Jakub Narębski (1):
26358 gitweb: Fix 'history' view for deleted files with history
26361 git-fetch: fix status output when not storing tracking ref
26364 Document option --only of git commit
26367 Clarify and fix English in "git-rm" documentation
26370 git-remote: reject adding remotes with invalid names
26372 Junio C Hamano (7):
26373 Document -w option to shortlog
26374 Documentation/git-submodule: typofix
26375 t7401: squelch garbage output
26376 rebase: do not munge commit log message
26377 git-am: minor cleanup
26378 am: POSIX portability fix
26381 Linus Torvalds (2):
26382 Ignore leading empty lines while summarizing merges
26383 git-am: cope better with an empty Subject: line
26386 git-submodule - possibly use branch name to describe a module
26389 Document that WebDAV doesn't need git on the server, and works over SSL
26391 Michele Ballabio (1):
26392 revision.c: make --date-order overriddable
26395 Force the medium pretty format on calls to git log
26398 git-submodule: Avoid 'fatal: cannot describe' message
26401 git-archive: ignore prefix when checking file attribute
26404 Clarify documentation of git-cvsserver, particularly in relation to git-shell
26407 git clean: Don't automatically remove directories when run within subdirectory
26408 git clean: Add test to verify directories aren't removed with a prefix
26411 Version v1.5.5; changes since v1.5.5-rc3:
26412 -----------------------------------------
26414 Christian Couder (2):
26415 git-gui: Update french translation
26416 test suite: remove useless TERM cruft in "t7005-editor.sh"
26419 git-svn: fix following renamed paths when tracking a single path
26422 gitk: Fix changing colors through Edit->Preferences
26424 Jakub Narębski (1):
26425 Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"
26427 Junio C Hamano (2):
26428 Fix "git apply" to correctly enforce "match at the beginning"
26432 git-fetch: Don't trigger a bus error when given the refspec "tag"
26434 Michele Ballabio (1):
26435 git-gui: use +/- instead of ]/[ to show more/less context in diff
26438 Add interactive option in rebase command completion list.
26439 Add prefix oriented completions for diff and format-patch commands.
26442 git-pack-objects.txt: Make wording slightly less ambiguous
26443 Add description of OFS_DELTA to the pack format description
26445 Shawn O. Pearce (1):
26446 git-gui: Switch keybindings for [ and ] to bracketleft and bracketright
26449 Version v1.5.5-rc3; changes since v1.5.5-rc2:
26450 ---------------------------------------------
26453 mktag.c: improve verification of tagger field and tests
26454 mktag.c: tweak validation of tagger field and adjust test script
26457 Silence cpio's "N blocks" output when cloning locally
26459 Christian Couder (1):
26460 help: Add a missing OPT_END().
26462 Damien Diederen (7):
26463 cvsserver: Respond to the 'editors' and 'watchers' commands
26464 cvsserver: Only print the file part of the filename in status header
26465 cvsserver: Do not include status output for subdirectories if -l is passed
26466 cvsserver: Add a few tests for 'status' command
26467 cvsserver: Implement update -p (print to stdout)
26468 cvsserver: Add test for update -p
26469 cvsserver: Use the user part of the email in log and annotate results
26472 git-svn: remove redundant slashes from show-ignore
26475 filter-branch: Test renaming directories in a tree-filter
26476 verify-tag: Clean up the temporary file if gpg cannot be started.
26477 t7004-tag: Skip more tests if gpg is not available.
26479 Jonathan del Strother (1):
26480 git-gui: Add shortcut keys for Show More/Less Context
26483 Allow git-cvsserver database table name prefix to be specified.
26485 Junio C Hamano (5):
26486 Add corner case tests for diff-index and diff-files
26487 diff-index: careful when inspecting work tree items
26488 diff-files: careful when inspecting work tree items
26489 Accept git aliases outside a git repository
26492 Marius Storm-Olsen (1):
26493 git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
26496 git-cvsserver: handle change type T
26498 Shawn O. Pearce (1):
26502 Describe the bug in handling filenames with funny characters in 'git add -i'
26504 veillette@yahoo.ca (1):
26505 filter-branch: Fix renaming a directory in the tree-filter
26508 Version v1.5.5-rc2; changes since v1.5.5-rc1:
26509 ---------------------------------------------
26512 t/t3800-mktag.sh: use test_must_fail rather than '!'
26514 Daniel Barkalow (2):
26515 Tighten refspec processing
26516 Fix branches file configuration
26518 Dirk Süsserott (1):
26519 Documentation: git-tag '-m'/'-F' implies '-a'
26521 Frank Lichtenheld (1):
26522 t9600-cvsimport.sh: set HOME before checking for cvsps availability
26525 imap-send: properly error out if imap.host is not set in config
26528 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
26529 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
26532 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
26534 Johannes Schindelin (2):
26535 RelNotes: mention checkout/branch's --track option, too
26536 init: show "Reinit" message even in an (existing) empty repository
26539 builtin-remote: Fix missing newline at end of listing of pushed branches
26541 Julian Phillips (1):
26542 Documentation/git-checkout: Update summary to reflect current abilities
26544 Junio C Hamano (7):
26545 refspec: allow colon-less wildcard "refs/category/*"
26546 git-fetch test: test tracking fetch results, not just FETCH_HEAD
26547 test_must_fail: 129 is a valid error code from usage()
26548 Update draft release notes for 1.5.4.5
26549 Update draft release notes for 1.5.5
26550 builtin-prune: protect objects listed on the command line
26553 Michele Ballabio (3):
26554 parse-options.c: introduce OPT_DATE
26555 Add tests for git-prune
26556 builtin-prune.c: use parse_options()
26559 Always set *nongit_ok in setup_git_directory_gently()
26562 Version v1.5.5-rc1; changes since v1.5.5-rc0:
26563 ---------------------------------------------
26566 builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto
26567 t/t7003-filter-branch.sh: use test_must_fail rather than '!'
26569 Daniel Barkalow (3):
26570 Tighten refspec processing
26574 Eyvind Bernhardsen (2):
26575 fast-import: Allow "reset" to delete a new branch without error
26576 fast-import: Document the effect of "merge" with no "from" in a commit
26578 Johannes Schindelin (1):
26579 remote show: do not show symbolic refs
26581 Junio C Hamano (10):
26582 Makefile: DIFF_OBJS is not special at all these days
26583 Makefile: flatten enumeration of headers, objects and programs
26584 t1000: use "test_must_fail git frotz", not "! git frotz"
26585 git-merge-one-file: fix longstanding stupid thinko
26586 Test: catch if trash cannot be removed
26587 Add tests to catch problems with un-unlinkable symlinks
26588 Fix read-tree not to discard errors
26589 remote.c: Fix overtight refspec validation
26590 gc --auto: raise default auto pack limit from 20 to 50
26594 Add --reverse to the git-rev-list usage string
26595 Document the sendemail.smtpserverport config variable
26596 Don't try and percent-escape existing percent escapes in git-svn URIs
26597 Make git-svn tests behave better on OS X
26599 Linus Torvalds (3):
26600 Don't update unchanged merge entries
26601 Fix possible Solaris problem in 'checkout_entry()'
26602 Make revision limiting more robust against occasional bad commit dates
26604 Marius Storm-Olsen (1):
26605 git-p4: Optimize the fetching of data from perforce.
26608 Documentation/git-merge: document subtree strategy.
26611 make it easier for people who just want to get rid of 'git gc --auto'
26613 Ralf Wildenhues (1):
26614 Improve description of git filter-branch.
26617 git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
26618 git-p4: Use P4EDITOR environment variable when set
26621 Version v1.5.5-rc0; changes since v1.5.4.7:
26622 -------------------------------------------
26624 Adam Piątyszek (1):
26625 git-gui: Add option for changing the width of the commit message text box
26628 Fix builtin checkout crashing when given an invalid path
26629 Fix test for cleanup failure in t7300 on Windows
26630 Do not use GUID on dir in git init --shared=all on FreeBSD
26631 git-gui: update russian translation
26633 Alexandre Julliard (5):
26634 git.el: Support for showing unknown/ignored directories.
26635 git.el: Added a command to amend a commit.
26636 git.el: Check for existing buffers on revert.
26637 git.el: Better handling of subprocess errors.
26638 git.el: Do not display empty directories.
26640 Andreas Ericsson (1):
26641 pack-objects: Add runtime detection of online CPU's
26643 Brandon Casey (13):
26644 builtin-reflog.c: fix typo that accesses an unset variable
26645 Add compat/fopen.c which returns NULL on attempt to open directory
26646 builtin-reflog.c: don't install new reflog on write failure
26647 reflog-delete: parse standard reflog options
26648 git-reflog: add option --rewrite to update reflog entries while expiring
26649 refs.c: make close_ref() and commit_ref() non-static
26650 git-reflog: add option --updateref to write the last reflog sha1 into the ref
26651 git-stash: add new 'drop' subcommand
26652 git-stash: add new 'pop' subcommand
26653 pack-objects: Print a message describing the number of threads for packing
26654 t3903-stash.sh: Add missing '&&' to body of testcase
26655 git-reflog.txt: Document new commands --updateref and --rewrite
26656 t3903-stash.sh: Add tests for new stash commands drop and pop
26659 compat: Add simplified merge sort implementation from glibc
26662 gitweb: Make use of the $git_dir variable at sub git_get_project_url_list
26663 gitweb: Use the config file to set repository owner's name.
26666 Eliminate confusing "won't bisect on seeked tree" failure
26669 Make builtin-reset.c use parse_options.
26671 Charles Bailey (6):
26672 Tidy up git mergetool's backup file behaviour
26673 Changed an internal variable of mergetool to support custom commands
26674 Teach git mergetool to use custom commands defined at config time
26675 Add a very basic test script for git mergetool
26676 git-mergetool documentaiton: show toolnames in typewriter font
26677 merge-tool documentation: describe custom command usage
26680 cleanup: remove unused git_checkout_config
26681 whatchanged documentation: share description of --pretty with others
26682 specify explicit "--pretty=medium" with `git log/show/whatchanged`
26683 log/show/whatchanged: introduce format.pretty configuration
26685 Christian Couder (17):
26686 help: make 'git-help--browse' usable outside 'git-help'.
26687 help--browse: add '--config' option to check a config option for a browser.
26688 Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
26689 instaweb: use 'git-web--browse' to launch browser.
26690 config: add test cases for empty value and no value config variables.
26691 Documentation: instaweb: add 'git-web--browse' information.
26692 web--browse: Add a few quotes in 'init_browser_path'.
26693 Documentation: add 'git-web--browse.txt' and simplify other docs.
26694 help.c: use 'git_config_string' to get 'help_default_format'.
26695 run-command: Redirect stderr to a pipe before redirecting stdout to stderr
26696 help: add "man.viewer" config var to use "woman" or "konqueror"
26697 Documentation: help: describe 'man.viewer' config variable
26698 help: implement multi-valued "man.viewer" config option
26699 Documentation: help: explain 'man.viewer' multiple values
26700 help: warn if specified 'man.viewer' is unsupported, instead of erroring out
26701 web--browse: use custom commands defined at config time
26702 Documention: web--browse: add info about "browser.<tool>.cmd" config var
26704 Christian Stimming (4):
26705 git-gui: (i18n) Fix a bunch of still untranslated strings.
26706 git-gui: Update German translation.
26707 git-gui: (i18n) Add newly added translation strings to template.
26708 git-gui: Update German translation.
26710 Clemens Buchacher (2):
26711 http-push: push <remote> :<branch> deletes remote branch
26712 http-push: add regression tests
26714 Daniel Barkalow (33):
26715 Test :/string form for checkout
26716 Reduce the number of connects when fetching
26717 Allow callers of unpack_trees() to handle failure
26718 Add flag to make unpack_trees() not print errors.
26719 Send unpack-trees debugging output to stderr
26720 Discard "deleted" cache entries after using them to update the working tree
26721 Add "skip_unmerged" option to unpack_trees.
26722 Build-in merge-recursive
26723 Move create_branch into a library file
26724 Use diff -u instead of diff in t7201
26725 Library function to check for unmerged index entries
26726 Move code to clean up after a branch change to branch.c
26728 Clean up reporting differences on branch switch
26729 API documentation for remote.h
26730 Add more tests for format-patch
26731 Improve message-id generation flow control for format-patch
26732 Export some email and pretty-printing functions
26733 Use ALLOC_GROW in remote.{c,h}
26734 Add a --cover-letter option to format-patch
26735 Add tests for extra headers in format-patch
26736 Fix format.headers not ending with a newline
26737 Combine To: and Cc: headers
26738 Support a --cc=<email> option in format-patch
26739 Resolve value supplied for no-colon push refspecs
26740 builtin-checkout.c: Remove unused prefix arguments in switch_branches path
26741 Add support for url aliases in config files
26742 Add API access to shortlog
26743 Improve collection of information for format-patch --cover-letter
26744 Always use the current connection's remote ref list in git protocol
26745 Use diff_tree() directly in making cover letter
26746 Write index file on any checkout of files
26747 Write diff output to a file in struct diff_options
26750 gitk: Don't show local changes when we there is no work tree
26753 git-send-email: Generalize auto-cc recipient mechanism.
26756 git.el: Set process-environment instead of invoking env
26758 Dmitry Potapov (3):
26759 git-web--browse: do not start the browser with nohup
26760 Make private quote_path() in wt-status.c available as quote_path_relative()
26761 git-clean: correct printing relative path
26764 git-svn: improve repository URL matching when following parents
26766 Florian La Roche (1):
26767 gitweb: Make feed entries point to commitdiff view
26769 Frank Lichtenheld (1):
26770 gc: Add --quiet option
26773 gitk: properly deal with tag names containing / (slash)
26774 git-merge-index documentation: clarify synopsis
26775 builtin-tag.c: remove cruft
26776 hash-object: cleanup handling of command line options
26778 Jakub Narębski (11):
26779 gitweb: Fix displaying unchopped argument in chop_and_escape_str
26780 gitweb: Add new option -nohtml to quot_xxx subroutines
26781 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
26782 gitweb: Fix bugs in git_search_grep_body: it's length(), not len()
26783 gitweb: Better cutting matched string and its context
26784 Add '--fixed-strings' option to "git log --grep" and friends
26785 gitweb: Change parse_commits signature to allow for multiple options
26786 gitweb: Simplify fixed string search
26787 Documentation: Remove --{min,max}-age option from git-log(1)
26788 gitweb: Mark first match when searching commit messages
26789 gitweb: Fix and simplify pickaxe search
26792 Add a BuildRequires for gettext in the spec file.
26794 Jason McMullan (1):
26795 Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
26798 git-web--browse: fix misplaced quote in init_browser_path()
26799 git-help--browse: improve browser support under OS X
26800 builtin-checkout.c: fix possible usage segfault
26801 branch: optionally setup branch.*.merge from upstream local branches
26802 doc: documentation update for the branch track changes
26803 Correct git-pull documentation
26804 send-email: fix In-Reply-To regression
26805 pull: pass --strategy along to to rebase
26807 Jean-Luc Herren (1):
26808 fast-import: exit with proper message if not a git dir
26811 allow suppressing of global and system config
26812 fix config reading in tests
26813 hard-code the empty tree object
26814 add--interactive: handle initial commit better
26815 git_config_*: don't assume we are parsing a config file
26816 t3404: use configured shell instead of /bin/sh
26817 diff: fix java funcname pattern for solaris
26818 t9001: enhance fake sendmail test harness
26819 send-email: test compose functionality
26821 make alias lookup a public, procedural function
26822 help: respect aliases
26823 use build-time SHELL_PATH in test scripts
26824 rename: warn user when we have turned off rename detection
26825 allow git-am to run in a subdirectory
26826 Add a test for read-tree -u --reset with a D/F conflict
26827 gitk: make autoselect optional
26828 tr portability fixes
26829 t0050: perl portability fix
26830 more tr portability test script fixes
26831 grep portability fix: don't use "-e" or "-q"
26832 remove use of "tail -n 1" and "tail -1"
26833 add test_cmp function for test scripts
26834 t4020: don't use grep -a
26835 t6000lib: tr portability fix
26836 add NO_EXTERNAL_GREP build option
26837 filter-branch: don't use xargs -0
26838 filter-branch: use $SHELL_PATH instead of 'sh'
26839 t9112: add missing #!/bin/sh header
26840 t7505: use SHELL_PATH in hook
26841 t6000lib: re-fix tr portability
26844 Avoid unnecessary "if-before-free" tests.
26847 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
26848 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
26850 Johannes Schindelin (21):
26851 Teach "git reflog" a subcommand to delete single entries
26852 Also use unpack_trees() in do_diff_cache()
26853 Fix "git clone" for git:// protocol
26854 Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
26855 Introduce the config variable pack.packSizeLimit
26856 bisect view: check for MinGW32 and MacOSX in addition to X11
26857 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
26858 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
26859 completion: support format-patch's --cover-letter option
26860 path-list: add functions to work with unsorted lists
26861 parseopt: add flag to stop on first non option
26862 Test "git remote show" and "git remote prune"
26863 Make git-remote a builtin
26864 builtin-remote: prune remotes correctly that were added with --mirror
26865 Fix make_absolute_path() for parameters without a slash
26866 format-patch: use the diff options for the cover letter, too
26867 format-patch: wrap cover-letter's shortlog sensibly
26868 remote show: Clean up connection correctly if object fetch wasn't done
26869 remote: fix "update [group...]"
26870 builtin remote rm: remove symbolic refs, too
26871 gc: call "prune --expire 2.weeks.ago" by default
26874 Fix misuse of prefix_path()
26875 gitk: Heed the lines of context in merge commits
26876 Technical documentation of the run-command API.
26877 prefix_path: use is_absolute_path() instead of *orig == '/'
26878 start_command(), .in/.out/.err = -1: Callers must close the file descriptor
26879 start_command(), if .in/.out > 0, closes file descriptors, not the callers
26880 git-submodule summary: fix that some "wc" flavors produce leading spaces
26883 man pages are littered with .ft C and others
26884 shortlog: do not require to run from inside a git repository
26886 Junichi Uekawa (1):
26887 git-blame.el: show the when, who and what in the minibuffer.
26889 Junio C Hamano (93):
26890 index: be careful when handling long names
26891 Avoid running lstat(2) on the same cache entry.
26892 read-cache.c: fix a couple more CE_REMOVE conversion
26893 read-cache.c: introduce is_racy_timestamp() helper
26895 Sane use of test_expect_failure
26896 test: reword the final message of tests with known breakages
26897 known breakage: revision range computation with clock skew
26898 fix misuse of prefix_path()
26899 builtin-apply.c: refactor small part that matches context
26900 builtin-apply.c: restructure "offset" matching
26901 builtin-apply.c: push match-beginning/end logic down
26902 builtin-apply.c: make it more line oriented
26903 builtin-apply.c: optimize match_beginning/end processing a bit.
26904 builtin-apply.c: mark common context lines in lineinfo structure.
26905 builtin-apply.c: clean-up apply_one_fragment()
26906 builtin-apply.c: simplify calling site to apply_line()
26907 builtin-apply.c: do not feed copy_wsfix() leading '+'
26908 builtin-apply.c: move copy_wsfix() function a bit higher.
26909 builtin-apply.c: pass ws_rule down to match_fragment()
26910 git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
26911 core.whitespace: cr-at-eol
26912 Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject header
26913 Documentation/SubmittingPatches: discuss first then submit
26914 Documentation/SubmittingPatches: What's Acked-by and Tested-by?
26915 Make error messages from cherry-pick/revert more sensible
26916 setup: sanitize absolute and funny paths in get_pathspec()
26917 git-add: adjust to the get_pathspec() changes.
26918 builtin-mv: minimum fix to avoid losing files
26919 gitignore(5): Allow "foo/" in ignore list to match directory "foo"
26920 gitignore: lazily find dtype
26921 Define the project whitespace policy
26922 apply: do not barf on patch with too large an offset
26923 Update the main documentation (stale notes section)
26924 .mailmap: adjust to a recent patch application glitch.
26925 diff --relative: output paths as relative to the current subdirectory
26926 diff --relative: help working in a bare repository
26927 checkout: notice when the switched branch is behind or forked
26928 Documentation/SubmittingPatches - a suggested patch flow
26929 Sync with 1.5.4.2 and start 1.5.5 Release Notes
26930 sending errors to stdout under $PAGER
26931 merge-recursive: split low-level merge functions out.
26932 expose a helper function peel_to_type().
26933 checkout: tone down the "forked status" diagnostic messages
26934 checkout: work from a subdirectory
26935 git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
26936 checkout: updates to tracking report
26937 gitweb: Better chopping in commit search results
26938 Add merge-subtree back
26939 checkout: show progress when checkout takes long time while switching branches
26940 ws_fix_copy(): move the whitespace fixing function to ws.c
26941 checkout: error out when index is unmerged even with -m
26942 diff --dirstat: saner handling of binary and unmerged files
26943 url rewriting: take longest and first match
26944 git-apply --whitespace=fix: fix off by one thinko
26945 Revert "pack-objects: Print a message describing the number of threads for packing"
26946 git-remote: do not complain on multiple URLs for a remote
26947 format-patch: remove a leftover debugging message
26948 tests: introduce test_must_fail
26949 Update draft release notes for 1.5.5
26950 t6024: move "git reset" to prepare for a test inside the test itself
26951 CodingGuidelines: spell out how we use grep in our scripts
26952 find_unique_abbrev(): redefine semantics
26953 Clean up find_unique_abbrev() callers
26954 diff-lib.c: constness strengthening
26955 diff: make sure work tree side is shown as 0{40} when different
26956 Update draft release notes for 1.5.5
26957 describe --always: fall back to showing an abbreviated object name
26958 git-describe: use tags found in packed-refs correctly
26959 describe: fix --long output
26960 describe: re-fix display_name()
26961 t6120 (describe): check --long properly
26962 Revert "receive-pack: use strict mode for unpacking objects"
26963 Revert "unpack-objects: prevent writing of inconsistent objects"
26964 fsck.c: fix bogus "empty tree" check
26965 am: read from the right mailbox when started from a subdirectory
26966 am: remove support for -d .dotest
26968 get_pathspec(): die when an out-of-tree path is given
26969 Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)
26970 Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)
26971 Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec())
26972 git-clean: add tests for relative path
26973 send-email: --no-signed-off-cc should suppress 'sob' cc
26974 traverse_trees_recursive(): propagate merge errors up
26975 git-gui: Simplify MSGFMT setting in Makefile
26976 Documentation/config: typofix
26977 Documentation/git-help: typofix
26978 read-tree() and unpack_trees(): use consistent limit
26979 Redo "add test_cmp function for test scripts"
26980 git-gui: Improve directions regarding POT update in po/README
26981 Resurrect git-rerere to contrib/examples
26982 Update draft release notes for 1.5.5
26985 git-svn: Don't call git-repack anymore
26986 Let "git svn" run "git gc --auto" occasionally
26989 bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with spaces
26991 Kristian Høgsberg (1):
26992 wt-status.c: no need for dup() dance anymore
26995 Simplify setup of $GIT_DIR in git-sh-setup.sh
26997 Linus Torvalds (22):
26998 Make on-disk index representation separate from in-core one
26999 Make run_diff_index() use unpack_trees(), not read_tree()
27000 Create pathname-based hash-table lookup into index
27001 Add "--dirstat" for some directory statistics
27002 gitk: learn --show-all output
27003 Add "--show-all" revision walker flag for debugging
27004 Fix name re-hashing semantics
27005 Name hash fixups: export (and rename) remove_hash_entry
27006 Use helper function for copying index entry information
27007 Be more verbose when checkout takes a long time
27008 Add 'df_name_compare()' helper function
27009 Make 'traverse_tree()' use linked structure rather than 'const char *base'
27010 Add return value to 'traverse_tree()' callback
27011 Make 'traverse_trees()' traverse conflicting DF entries in parallel
27012 Move 'unpack_trees()' over to 'traverse_trees()' interface
27013 Fix tree-walking compare_entry() in the presense of --prefix
27014 Add 'const' where appropriate to index handling functions
27015 Make 'unpack_trees()' take the index to work on as an argument
27016 Make 'unpack_trees()' have a separate source and destination index
27017 unpack_trees(): minor memory leak fix in unused destination index
27018 unpack_trees(): fix diff-index regression.
27019 Fix recent 'unpack_trees()'-related changes breaking 'git stash'
27021 Marco Costalba (1):
27022 Avoid a useless prefix lookup in strbuf_expand()
27025 git-submodule - Allow adding a submodule in-place
27027 Martin Koegler (28):
27028 git-fsck: report missing author/commit line in a commit as an error
27029 parse_object_buffer: don't ignore errors from the object specific parsing functions
27030 deref_tag: handle return value NULL
27031 deref_tag: handle tag->tagged = NULL
27032 check return code of prepare_revision_walk
27033 read_object_with_reference: don't read beyond the buffer
27034 get_sha1_oneline: check return value of parse_object
27035 mark_blob/tree_uninteresting: check for NULL
27036 reachable.c::add_one_tree: handle NULL from lookup_tree
27037 list-objects.c::process_tree/blob: check for NULL
27038 check results of parse_commit in merge_bases
27039 process_tag: handle tag->tagged == NULL
27040 reachable.c::process_tree/blob: check for NULL
27041 revision.c: handle tag->tagged == NULL
27042 parse_commit: don't fail, if object is NULL
27043 check return value from parse_commit() in various functions
27044 peel_onion: handle NULL
27045 add generic, type aware object chain walker
27046 builtin-fsck: move away from object-refs to fsck_walk
27047 Remove unused object-ref code
27048 builtin-fsck: reports missing parent commits
27049 builtin-fsck: move common object checking code to fsck.c
27050 add common fsck error printing function
27051 unpack-object: cache for non written objects
27052 unpack-objects: prevent writing of inconsistent objects
27053 index-pack: introduce checking mode
27054 receive-pack: use strict mode for unpacking objects
27055 fetch-pack: check parse_commit/object results
27057 Matthias Kestenholz (1):
27058 Add color.ui variable which globally enables colorization if set
27060 Michael Witten (3):
27061 git-send-email: ssh/login style password requests
27062 git-send-email: SIG{TERM,INT} handlers
27063 git-send-email: Better handling of EOF
27066 Add compat/snprintf.c for systems that return bogus
27067 autoconf: Test FREAD_READS_DIRECTORIES
27069 Michele Ballabio (7):
27070 gitk: Fix "Key bindings" message
27071 git-gui: fix typo in lib/spellcheck.tcl
27072 builtin-for-each-ref.c: fix typo in error message
27073 gitk: Mark another string for translation
27074 git-gui: update Italian translation
27075 gitk: initial Italian translation
27076 git-gui: remove spurious "fuzzy" attributes in po/it.po
27079 Work around curl-gnutls not liking to be reinitialized
27080 Add test for git rebase --abort
27081 Documentation/git-rebase.txt: Add --strategy to synopsys
27082 git rebase --abort: always restore the right commit
27083 t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
27086 git-clean: handle errors if removing files fails
27087 Improve t6029 to check the real "subtree" case
27088 Update Hungarian translation. 100% completed.
27089 git-gui: Updated Hungarian translation (e5fba18)
27091 Nanako Shiraishi (2):
27092 git-gui: Update Japanese translation
27093 git-gui: Update Japanese translation
27096 factorize revindex code out of builtin-pack-objects.c
27097 make verify_one_pack() a bit less wrong wrt packed_git structure
27098 fix unimplemented packed_object_info_detail() features
27099 add storage size output to 'git verify-pack -v'
27100 pack-objects: proper pack time stamping with --max-pack-size
27103 git-commit: support variable number of hook arguments
27104 git-commit: set GIT_EDITOR=: if editor will not be launched
27105 git-commit: Refactor creation of log message.
27106 git-commit: add a prepare-commit-msg hook
27108 Paul Mackerras (3):
27109 gitk: Only restore window size from ~/.gitk, not position
27110 gitk: Avoid Tcl error when switching views
27111 gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
27113 Pekka Kaitaniemi (1):
27114 gitk: Add horizontal scrollbar to the diff view
27116 Peter Krefting (2):
27117 git-gui: Regenerated po template and merged translations with it
27118 git-gui: updated Swedish translation
27121 gitweb: Clearly distinguish regexp / exact match searches
27123 Philipp A. Hartmann (1):
27124 git-gui: if a background colour is set, set foreground colour as well
27126 Philippe Bruhat (3):
27127 cvsimport: have default merge regex allow for dashes in the branch name
27128 cvsimport: allow for multiple -M options
27129 cvsimport: document that -M can be used multiple times
27131 Pierre Habouzit (4):
27132 git-describe: Add a --match option to limit considered tags.
27133 git-name-rev: add a --(no-)undefined option.
27134 parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt
27135 parse-options: new option type to treat an option-like parameter as an argument.
27138 git-submodule summary: code framework
27139 git-submodule summary: show commit summary
27140 git-submodule summary: limit summary size
27141 git-submodule summary: documentation
27142 git-submodule summary: test
27144 Rafael Garcia-Suarez (1):
27145 Make git-remote.perl "use strict" compliant
27147 Ralf Wildenhues (1):
27150 Robin Rosenberg (2):
27151 Make blame accept absolute paths
27152 Improve bash prompt to detect various states like an unfinished merge
27155 bash: add git-branch options
27156 bash: git-branch -d and -m lists only local branches
27157 bash: remove unnecessary conditions when checking for subcommands
27158 bash: refactor searching for subcommands on the command line
27159 bash: add new 'git stash' subcommands
27160 bash: add 'git svn' subcommands and options
27161 bash: use __gitdir when completing 'git rebase' options
27162 bash: fix long option with argument double completion
27163 update 'git rebase' documentation
27165 Samuel Tardieu (1):
27166 "remote update": print remote name being fetched from
27169 git-bundle.txt: Add different strategies to create the bundle
27170 git-describe: --long shows the object name even for a tagged commit
27171 clone: support cloning full bundles
27173 Sebastian Noack (1):
27174 git-svn: Don't prompt for client cert password everytime.
27176 Shawn O. Pearce (37):
27177 git-gui: Automatically spell check commit messages as the user types
27178 git-gui: Paper bag fix bad string length call in spellchecker
27179 git-gui: Correct size of dictionary name widget in options dialog
27180 Include annotated tags in fast-import crash reports
27181 Include the fast-import marks table in crash reports
27182 Finish current packfile during fast-import crash handler
27183 Update fast-import documentation to discuss crash reports
27184 Teach git-grep --name-only as synonym for -l
27185 git-gui: Ensure all spellchecker 'class' variables are initialized
27186 git-gui: Remove explicit references to 'aspell' in message strings
27187 git-gui: Only bind the spellcheck popup suggestion hook once
27188 git-gui: Catch and display aspell startup failures to the user
27189 git-gui: Gracefully display non-aspell version errors to users
27190 git-gui: Shorten Aspell version strings to just Aspell version number
27191 Optimize peel_ref for the current ref of a for_each_ref callback
27192 Teach git-describe to use peeled ref information when scanning tags
27193 Avoid accessing non-tag refs in git-describe unless --all is requested
27194 Teach git-describe --exact-match to avoid expensive tag searches
27195 Use git-describe --exact-match in bash prompt on detached HEAD
27196 Teach git-describe to verify annotated tag names before output
27197 Remove unused variable in builtin-fetch find_non_local_tags
27198 Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
27199 Ensure tail pointer gets setup correctly when we fetch HEAD only
27200 Allow builtin-fetch's find_non_local_tags to append onto a list
27201 Free the path_lists used to find non-local tags in git-fetch
27202 Teach upload-pack to log the received need lines to an fd
27203 Make git-fetch follow tags we already have objects for sooner
27204 Teach git-fetch to grab a tag at the same time as a commit
27205 Don't allow git-describe failures to go unnoticed in t6120
27206 Test for packed tags in git-describe output
27207 Add git-describe test for "verify annotated tag names on output"
27208 git-pack-objects: Automatically pack annotated tags if object was packed
27209 Teach fetch-pack/upload-pack about --include-tag
27210 Teach git-fetch to exploit server side automatic tag following
27211 bash: Remove completion of core.legacyheaders option
27212 git-gui: Don't translate the special Apple menu
27213 git-gui: Adjusted Japanese translation to updated POT
27215 Simon Hausmann (7):
27216 git-p4: Fix submit user-interface.
27217 git-p4: Ensure the working directory and the index are clean before "git-p4 rebase"
27218 git-p4: Remove --log-substitutions feature.
27219 git-p4: Clean up git-p4 submit's log message handling.
27220 git-p4: Removed git-p4 submit --direct.
27221 git-p4: git-p4 submit cleanups.
27222 git-p4: Fix import of changesets with file deletions
27224 Steffen Prohaska (4):
27225 safecrlf: Add mechanism to warn about irreversible crlf conversions
27226 gitk: Add checkbutton to ignore space changes
27227 t4014: Replace sed's non-standard 'Q' by standard 'q'
27228 Add tests for filesystem challenges (case and unicode normalization)
27231 bash: Add more long options to be completed with "git --<TAB>"
27234 Add `git svn blame' command
27237 git-p4: Fix indentation from tab to spaces
27240 git-p4: Fix an obvious typo
27241 git-p4: support exclude paths
27243 Tor Arvid Lund (1):
27244 git-p4: Support usage of perforce client spec
27246 Uwe Kleine-König (1):
27247 rev-list: add --branches, --tags and --remotes
27250 Add an --argscmd flag to get the list of refs to show
27253 git-gui: translate the remaining messages in zh_cn.po to chinese
27256 Version v1.5.4.7; changes since v1.5.4.6:
27257 -----------------------------------------
27259 Junio C Hamano (2):
27260 gitweb: do not run "git diff" that is Porcelain
27264 Version v1.5.4.6; changes since v1.5.4.5:
27265 -----------------------------------------
27267 A Large Angry SCM (1):
27268 git-repack: re-enable parsing of -n command line option
27270 Alberto Bertogli (1):
27271 builtin-apply: Show a more descriptive error on failure when opening a patch
27274 copy.c: copy_fd - correctly report write errors
27275 archive.c: format_subst - fixed bogus argument to memchr
27277 Björn Steinbrink (1):
27278 Fix section about backdating tags in the git-tag docs
27281 Fix documentation syntax of optional arguments in short options.
27282 core-tutorial.txt: Fix showing the current behaviour.
27284 Christian Couder (4):
27285 bisect: fix bad rev checking in "git bisect good"
27286 bisect: report bad rev better
27287 bisect: squelch "fatal: ref HEAD not a symref" misleading message
27288 git-bisect: make "start", "good" and "skip" succeed or fail atomically
27290 Clifford Caoile (1):
27291 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
27294 Remove 'header' from --signoff option description
27296 Dirk Süsserott (1):
27297 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
27299 Dustin Sallings (1):
27300 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
27302 Florian Ragwitz (1):
27303 filter-branch: Documentation fix.
27306 Documentation/git-describe.txt: make description more readable
27309 t5516: remove ambiguity test (1)
27310 fix reflog approxidate parsing bug
27311 cvsimport: always pass user data to "system" as a list
27312 doc: clarify definition of "update" for git-add -u
27313 doc/git-daemon: s/uploadarchive/uploadarch/
27314 git-am: fix typo in usage message
27317 Document option --only of git commit
27318 wt-status.h: declare global variables as extern
27319 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
27322 Clarify and fix English in "git-rm" documentation
27324 Junio C Hamano (7):
27325 Fix "git apply" to correctly enforce "match at the beginning"
27326 Document -w option to shortlog
27327 git-am: minor cleanup
27328 am: POSIX portability fix
27329 write-tree: properly detect failure to write tree objects
27330 git-shell: accept "git foo" form
27333 Linus Torvalds (2):
27334 Ignore leading empty lines while summarizing merges
27335 git-am: cope better with an empty Subject: line
27338 Linked glossary from cvs-migration page
27340 Matthew Ogilvie (1):
27341 gitattributes: Fix subdirectory attributes specified from root directory
27344 svn-git: Use binmode for reading/writing binary rev maps
27346 Michele Ballabio (1):
27347 revision.c: make --date-order overriddable
27350 diff options documentation: refer to --diff-filter in --name-status
27353 builtin-fast-export: Only output a single parent per line
27356 git-archive: ignore prefix when checking file attribute
27359 Clarify documentation of git-cvsserver, particularly in relation to git-shell
27361 Sitaram Chamarty (1):
27362 builtin-commit.c: add -u as short name for --untracked-files
27364 Thomas Guyot-Sionnest (1):
27365 git-svn bug with blank commits and author file
27368 Version v1.5.4.5; changes since v1.5.4.4:
27369 -----------------------------------------
27371 Andy Whitcroft (1):
27372 shortlog: take the first populated line of the description
27375 git-new-workdir: Share SVN meta data between work dirs and the repository
27378 t/t3800-mktag.sh: use test_must_fail rather than '!'
27380 Clemens Buchacher (1):
27381 merge-recursive: handle file mode changes
27383 Daniel Barkalow (2):
27384 Tighten refspec processing
27385 Fix branches file configuration
27388 git-svn: don't blindly append '*' to branch/tags config
27391 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
27393 Jakub Narębski (1):
27394 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
27397 t0021: tr portability fix for Solaris
27398 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
27400 Johannes Schindelin (3):
27401 launch_editor(): allow spaces in the filename
27402 git fetch: Take '-n' to mean '--no-tags'
27403 merge-file: handle empty files gracefully
27406 Make man page building quiet when DOCBOOK_XSL_172 is defined
27408 Junio C Hamano (9):
27409 filter-branch: handle "disappearing tree" case correctly in subdir filter
27410 git-pull documentation: warn about the option order
27411 quiltimport: fix misquoting of parsed -p<num> parameter
27412 format-patch: generate MIME header as needed even when there is format.header
27413 rebase -m: do not trigger pre-commit verification
27414 Start draft ReleaseNotes for 1.5.4.5
27415 git-fetch test: test tracking fetch results, not just FETCH_HEAD
27416 Update draft release notes for 1.5.4.5
27419 Linus Torvalds (1):
27420 rev-parse: fix meaning of rev~ vs rev~0.
27422 Marc-André Lureau (2):
27423 git-svn: fix find-rev error message when missing arg
27424 git-cvsimport: fix merging with remote parent branch
27427 git rebase --abort: always restore the right commit
27429 Pierre Habouzit (1):
27430 git-quiltimport: better parser to grok "enhanced" series files.
27433 Minor wording changes in the keyboard descriptions in git-add --interactive.
27436 Version v1.5.4.4; changes since v1.5.4.3:
27437 -----------------------------------------
27440 Really make the LF after reset in fast-import optional
27442 Björn Steinbrink (1):
27443 receive-pack: Initialize PATH to include exec-dir.
27446 builtin-reflog.c: don't install new reflog on write failure
27449 Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
27451 Caio Marcelo de Oliveira Filho (1):
27452 filter-branch documentation: non-zero exit status in command abort the filter
27455 Eliminate confusing "won't bisect on seeked tree" failure
27457 Daniel Barkalow (3):
27458 Use a single implementation and API for copy_file()
27459 Don't use GIT_CONFIG in t5505-remote
27460 Correct name of diff_flush() in API documentation
27463 templates/Makefile: don't depend on local umask setting
27464 git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
27467 rev-parse: fix potential bus error with --parseopt option spec handling
27468 send-email: fix In-Reply-To regression
27471 revert: actually check for a dirty index
27474 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
27475 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
27477 Johannes Schindelin (4):
27478 http-push: avoid invalid memory accesses
27479 http-push: do not get confused by submodules
27480 http-push: avoid a needless goto
27481 cvsexportcommit: be graceful when "cvs status" reorders the arguments
27484 daemon: send more error messages to the syslog
27485 daemon: ensure that base-path is an existing directory
27488 Fix dcommit, rebase when rewriteRoot is in use
27490 Jonathan del Strother (1):
27491 Prompt to continue when editing during rebase --interactive
27493 Junio C Hamano (6):
27494 Fix "git log --merge --left-right"
27495 Start preparing for 1.5.4.4
27496 tests: introduce test_must_fail
27497 Update draft release notes for 1.5.4.4
27498 test-lib: fix TERM to dumb for test repeatability
27502 Fix incorrect wording in git-merge.txt.
27505 Set proxy override with http_init()
27506 Fix random crashes in http_cleanup()
27509 Documentation cherry-pick: Fix cut-and-paste error
27512 Documentation/git-filter-branch: add a new msg-filter example
27513 Documentation/git svn log: add a note about timezones.
27515 Pierre Habouzit (1):
27516 unquote_c_style: fix off-by-one.
27519 git-submodule: Fix typo 'url' which should be '$url'
27522 git.el: find the git-status buffer whatever its name is
27525 ident.c: reword error message when the user name cannot be determined
27527 Sebastian Noack (1):
27528 git-svn: Don't prompt for client cert password everytime.
27530 Shawn O. Pearce (6):
27531 Ensure 'make dist' compiles git-archive.exe on Cygwin
27532 Protect peel_ref fallback case from NULL parse_object result
27533 Correct fast-export file mode strings to match fast-import standard
27534 git-gui: Paper bag fix info dialog when no files are staged at commit
27535 Fix 'git remote show' regression on empty repository in 1.5.4
27536 git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
27539 timezone_names[]: fixed the tz offset for New Zealand.
27541 Uwe Kleine-König (1):
27542 config.txt: refer to --upload-pack and --receive-pack instead of --exec
27545 Version v1.5.4.3; changes since v1.5.4.2:
27546 -----------------------------------------
27549 git-clone.sh: properly configure remote even if remote's head is dangling
27552 git-gui: support Git Gui.app under OS X 10.5
27553 send-email: squelch warning due to comparing undefined $_ to ""
27556 push: indicate partialness of error message
27557 Documentation/push: clarify matching refspec behavior
27558 push: document the status output
27559 hash: fix lookup_hash semantics
27561 Junio C Hamano (1):
27564 Kristian Høgsberg (1):
27565 Rename git-core rpm to just git and rename the meta-pacakge to git-all.
27568 Documentation/git-stash: document options for git stash list
27570 Pekka Kaitaniemi (1):
27571 Clarified the meaning of git-add -u in the documentation
27573 Shawn O. Pearce (5):
27574 git-gui: Ensure error dialogs always appear over all other windows
27575 git-gui: Paper bag fix error dialogs opening over the main window
27576 git-gui: Default TCL_PATH to same location as TCLTK_PATH
27577 git-gui: Avoid hardcoded Windows paths in Cygwin package files
27578 git-gui: Focus insertion point at end of strings in repository chooser
27580 Wincent Colaiuta (1):
27581 git-gui: relax "dirty" version detection
27584 Version v1.5.4.2; changes since v1.5.4.1:
27585 -----------------------------------------
27587 Christian Couder (8):
27588 config: add test cases for empty value and no value config variables.
27589 diff.c: replace a 'strdup' with 'xstrdup'.
27590 diff.c: remove useless check for value != NULL
27591 config: add 'git_config_string' to refactor string config variables.
27592 Add "const" qualifier to "char *pager_program".
27593 Add "const" qualifier to "char *editor_program".
27594 Add "const" qualifier to "char *excludes_file".
27595 diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
27597 Daniel Barkalow (1):
27598 Validate nicknames of remote branches to prohibit confusing ones
27600 David Steven Tweed (1):
27601 Make git prune remove temporary packs that look like write failures
27603 Frank Lichtenheld (1):
27604 config: Fix --unset for continuation lines
27607 builtin-commit: remove .git/SQUASH_MSG upon successful commit
27608 cvsimport: have default merge regex also match beginning of commit message
27611 Add a BuildRequires for gettext in the spec file.
27614 mailinfo: feed only one line to handle_filter() for QP input
27617 status: suggest "git rm --cached" to unstage for initial commit
27618 commit: discard index after setting up partial commit
27620 Johannes Schindelin (3):
27621 bisect: allow starting with a detached HEAD
27622 Document that the default of branch.autosetupmerge is true
27623 bisect: use verbatim commit subject in the bisect log
27626 upload-pack: Initialize the exec-path.
27629 man pages are littered with .ft C and others
27631 Junio C Hamano (31):
27632 git-pull documentation: fix markup
27633 archive-tar.c: guard config parser from value=NULL
27634 Add config_error_nonbool() helper function
27635 builtin-apply.c: guard config parser from value=NULL
27636 builtin-branch.c: guard config parser from value=NULL
27637 builtin-commit.c: guard config parser from value=NULL
27638 builtin-config.c: guard config parser from value=NULL
27639 builtin-log.c: guard config parser from value=NULL
27640 builtin-reflog.c: guard config parser from value=NULL
27641 builtin-show-branch.c: guard config parser from value=NULL
27642 builtin-tag.c: guard config parser from value=NULL
27643 connect.c: guard config parser from value=NULL
27644 convert.c: guard config parser from value=NULL
27645 diff.c: guard config parser from value=NULL
27646 git.c: guard config parser from value=NULL
27647 help.c: guard config parser from value=NULL
27648 http.c: guard config parser from value=NULL
27649 merge-recursive.c: guard config parser from value=NULL
27650 remote.c: guard config parser from value=NULL
27651 setup.c: guard config parser from value=NULL
27652 wt-status.c: guard config parser from value=NULL
27653 imap-send.c: guard config parser from value=NULL
27654 builtin-log.c: guard config parser from value=NULL
27655 config.c: guard config parser from value=NULL
27656 Revert "pack-objects: only throw away data during memory pressure"
27657 Protect get_author_ident_from_commit() from filenames in work tree
27658 diff.c: fixup garding of config parser from value=NULL
27659 diff: Fix miscounting of --check output
27660 filter-branch: handle filenames that need quoting
27661 Documentation/git-reset:
27664 Martin Koegler (1):
27665 pack-objects: only throw away data during memory pressure
27668 Work around curl-gnutls not liking to be reinitialized
27671 builtin-gc.c: guard config parser from value=NULL
27672 git clone -s documentation: force a new paragraph for the NOTE
27675 Documentation/git-reset: don't mention --mixed for selected-paths reset
27676 Documentation/git-reset: Add an example of resetting selected paths
27678 Sergei Organov (1):
27679 git-cvsimport.txt: fix '-M' description.
27681 Shawn O. Pearce (1):
27682 fast-import: check return value from unpack_entry()
27685 hg-to-git: fix parent analysis
27687 Uwe Kleine-König (1):
27688 rebase -i: accept -m as advertised in the man page
27691 Version v1.5.4.1; changes since v1.5.4:
27692 ---------------------------------------
27695 INSTALL: git-merge no longer uses cpio
27698 Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
27700 Junio C Hamano (3):
27701 Update stale documentation links from the main documentation.
27702 Fix "git-commit -C $tag"
27703 gitattributes: fix relative path matching
27706 git-am: fix type in its usage string
27707 git-remote documentation: fix synopsis to match description
27710 Fix typo in 'blame' documentation.
27713 Fix parsing numeric color values
27716 Version v1.5.4; changes since v1.5.4-rc5:
27717 -----------------------------------------
27720 git-relink: avoid hard linking in objects/info directory
27721 filter-branch.sh: remove temporary directory on failure
27722 filter-branch docs: remove brackets so not to imply revision arg is optional
27723 filter-branch: assume HEAD if no revision supplied
27726 gitweb: Make use of the $git_dir variable at sub git_get_project_description
27728 Christian Couder (3):
27729 Documentation: config: add "browser.<tool>.path".
27730 Documentation: help: specify supported html browsers.
27731 instaweb: use 'browser.<tool>.path' config option if it's set.
27733 Jakub Narębski (1):
27734 gitweb: Add info about $projectroot and $projects_list to gitweb/README
27736 Jean-Luc Herren (1):
27737 Documentation/git-cvsserver: Fix typo
27740 t9001: add missing && operators
27745 Johannes Schindelin (1):
27746 Add test for rebase -i with commits that do not pass pre-commit
27748 Junio C Hamano (4):
27749 reflog-expire: Avoid creating new files in a directory inside readdir(3) loop
27750 Revert "filter-branch docs: remove brackets so not to imply revision arg is optional"
27751 Fix "git checkout -b foo ':/substring'"
27754 Michele Ballabio (1):
27755 Fix typo in a comment in t/test-lib.sh
27758 git rev-parse manpage: spelling fix
27760 Shawn O. Pearce (1):
27761 Use 'printf %s $x' notation in t5401
27764 gitweb: Convert generated contents to utf8 in commitdiff_plain
27767 Version v1.5.4-rc5; changes since v1.5.4-rc4:
27768 ---------------------------------------------
27771 Make t5710 more strict when creating nested repos
27774 git-commit: exit non-zero if we fail to commit the index
27777 git-svn: default to repacking every 1000 commits
27779 Gustaf Hendeby (1):
27780 send-email, fix breakage in combination with --compose
27782 Jakub Narębski (1):
27783 autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.
27785 Johannes Schindelin (1):
27786 pull --rebase: be cleverer with rebased upstream branches
27788 Junio C Hamano (5):
27789 git-submodule: rename shell functions for consistency
27790 git-submodule: fix subcommand parser
27791 git-submodule: add test for the subcommand parser fix
27792 Clarify that http-push being temporarily disabled with older cURL
27796 Add a missing dependency on http.h
27797 Documentation: add a bit about sendemail.to configuration
27800 git-clone -s: document problems with git gc --prune
27801 git pull manpage: don't include -n from fetch-options.txt
27804 pack-objects: Fix segfault when object count is less than thread count
27806 Pierre Habouzit (1):
27807 parse-options: catch likely typo in presense of aggregated options.
27809 Robert Schiele (2):
27810 pre-POSIX.1-2001 systems do not have <sys/select.h>
27811 Makefile: customization for supporting HP-UX
27814 git-svn(1): update instructions for resuming a git-svn clone
27816 Shawn O. Pearce (10):
27817 git-gui: Honor the standard commit-msg hook
27818 git-gui: Correct window title for hook failure dialogs
27819 git-gui: Consolidate hook execution code into a single function
27820 git-gui: Correct encoding of glossary/fr.po to UTF-8
27821 Teach fast-import to honor pack.compression and pack.depth
27822 Document the hairy gfi_unpack_entry part of fast-import
27823 git-gui: Work around random missing scrollbar in revision list
27824 git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
27825 git-gui: Make the statistics of po2msg match those of msgfmt
27826 git-gui: Correctly cleanup msgfmt '1 message untranslated' output
27828 Steffen Prohaska (3):
27829 submodule: Document the details of the command line syntax
27830 t9400-git-cvsserver-server: Wrap setup into test case
27831 cvsserver: Fix for histories with multiple roots
27834 Version v1.5.4-rc4; changes since v1.5.4-rc3:
27835 ---------------------------------------------
27838 Correct spelling in diff.c comment
27841 close_lock_file(): new function in the lockfile API
27842 Improve use of lockfile API
27843 refs.c: rework ref_locks by abstracting from underlying struct lock_file
27844 fast-import.c: don't try to commit marks file if write failed
27846 Christian Couder (2):
27847 git-gui: Initial french translation
27848 git-gui: add french glossary: glossary/fr.po
27850 Christian Stimming (4):
27851 git-gui: Update glossary: add term "hunk"
27852 git-gui: Update German translation
27853 git-gui: Fix broken revert confirmation.
27854 git-gui: Improve German translation.
27857 Remove usage of git- (dash) commands from email hook
27858 cvsimport: remove last use of repo-config from git standard tools
27859 Update git-completion for new 'remote rm' option
27861 Dave Peticolas (1):
27862 Documentation: fix and clarify grammar in git-merge docs.
27864 Dmitry Potapov (1):
27865 treat any file with NUL as binary
27868 git-svn: handle leading/trailing whitespace from svnsync revprops
27870 Grégoire Barbier (4):
27871 http-push: disable http-push without USE_CURL_MULTI
27872 http-push: fix webdav lock leak.
27873 http-push: fail when info/refs exists and is already locked
27874 http-push and http-fetch: handle URLs without trailing /
27876 Jakub Narębski (1):
27877 autoconf: Add checking for unsetenv function
27879 Jean-Luc Herren (1):
27880 Make default pre-commit hook less noisy
27883 git-clean: fix off-by-one memory access when given no arguments
27884 color unchanged lines as "plain" in "diff --color-words"
27885 send-email: detect invocation errors earlier
27886 send-email: validate patches before sending anything
27887 send-email: add no-validate option
27890 fast-import: Don't use a maybe-clobbered errno value
27891 doc typo: s/prior committing/prior to committing/
27893 Johannes Schindelin (1):
27894 gitk: make Ctrl "+" really increase the font size
27896 Junio C Hamano (8):
27897 builtin-commit.c: remove useless check added by faulty cut and paste
27898 Revert "builtin-commit.c: remove useless check added by faulty cut and paste"
27899 Fix git-rerere documentation
27900 Squelch bogus progress output from git-rebase--interactive
27901 Document lockfile API
27902 Officially deprecate repo-config.
27903 http-push: clarify the reason of error from the initial PROPFIND request
27906 Kristian Høgsberg (1):
27907 git-commit: fix double close(2) that can close a wrong file descriptor
27910 Move sha1_file_to_archive into libgit
27912 Linus Torvalds (4):
27913 Fix performance regression for partial commits
27914 Make builtin-commit.c more careful about parenthood
27915 Make 'git fsck' complain about non-commit branches
27916 Be more careful about updating refs
27919 hg-to-git: improve popen calls
27922 git-gui: Makefile - Handle $DESTDIR on Cygwin
27924 Martin Koegler (1):
27925 parse_commit_buffer: tighten checks while parsing
27928 Add using merge subtree How-To
27929 ls-remote: add -t and -h options.
27930 Include rev-list options in git-log manpage.
27932 Peter Krefting (1):
27933 git-gui: Updated Swedish translation after mailing list review.
27935 Shawn O. Pearce (3):
27936 git-gui: Allow 'Create New Repository' on existing directories
27937 git-gui: Refresh file status description after hunk application
27938 Fix random fast-import errors when compiled with NO_MMAP
27941 core-tutorial typofix
27944 Version v1.5.4-rc3; changes since v1.5.4-rc2:
27945 ---------------------------------------------
27947 Alexandre Julliard (6):
27948 git.el: Support for getting diffs from inside the log-edit buffer.
27949 git.el: Retrieve the permissions for up-to-date files.
27950 git.el: Display file types and type changes.
27951 git.el: Make sure we never insert the same file twice.
27952 git.el: Refresh files from their real state upon commit.
27953 git.el: Make status refresh faster.
27956 git-gui: Make commit log messages end with a newline
27959 git-relink.txt: describe more clearly how hard linking occurs
27961 Charles Bailey (1):
27962 gitk: Fix the Makefile to cope with systems lacking msgfmt
27964 Christian Couder (1):
27965 Documentation: config: add 'help.*' and 'instaweb.*' variables.
27967 Christian Stimming (10):
27968 gitk i18n: Add Makefile with rules for po file creation and installation
27969 gitk i18n: Import msgcat for message string translation; load translation catalogs
27970 gitk i18n: Markup several strings for translation
27971 gitk i18n: Initial German translation
27972 gitk i18n: More markup -- various options menus
27973 gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
27974 gitk: Update and fix Makefile
27975 gitk: Update German translation
27976 gitk: Fix typo in user message.
27977 gitk: Update German translation.
27980 Documentation: rename gitlink macro to linkgit
27983 git-svn: allow dcommit --no-rebase to commit multiple, dependent changes
27984 git-svn: unlink index files that were globbed, too
27985 git-svn: support for funky branch and project names over HTTP(S)
27986 git-svn: clarify the "Ignoring error from SVN" piece
27988 Florian La Roche (1):
27989 Change git-gc documentation to reflect gc.packrefs implementation.
27992 gitk: use user-configured background in view definition dialog
27994 Grégoire Barbier (1):
27995 Fix double-free() in http-push.c:remote_exists()
27997 Gustaf Hendeby (1):
27998 Documentation/user-manual.txt: fix typo
28000 J. Bruce Fields (1):
28001 Documentation: fix remote.<name>.skipDefaultUpdate description
28004 Make the git metapackage require the same version of the subpackages.
28007 config: handle lack of newline at end of file better
28008 git-reset: refuse to do hard reset in a bare repository
28009 add a "basic" diff config callback
28010 diff: load funcname patterns in "basic" config
28011 diff: remove lazy config loading
28012 add--interactive: remove unused diff colors
28013 add--interactive: allow diff colors without interactive colors
28014 Document the color.interactive semantics
28017 Fix grammar nits in documentation and in code comments.
28018 Don't access line[-1] for a zero-length "line" from fgets.
28019 bundle, fast-import: detect write failure
28021 Johannes Schindelin (2):
28022 Optimize prefixcmp()
28023 shortlog: mention the "-e" option in the usage
28026 git-gui: Move frequently used commands to the top of the context menu.
28027 recv_sideband: Do not use ANSI escape sequence on dumb terminals.
28029 Junio C Hamano (27):
28030 Documentation/git-submodule.txt: typofix
28031 "git pull --tags": error out with a better message.
28032 git-rebase -i behaves better on commits with incomplete messages
28033 git-rebase -i: clean-up error check codepath.
28034 lock_any_ref_for_update(): reject wildcard return from check_ref_format
28035 Update callers of check_ref_format()
28036 Uninline prefixcmp()
28037 git-clean: make "Would remove ..." path relative to cwd again
28038 t/t7600: avoid GNUism in grep
28039 t/t{3600,3800,5401}: do not use egrep when grep would do
28040 t/t3800: do not use a temporary file to hold expected result.
28041 Update draft release notes for 1.5.4
28042 git-stash clear: refuse to work with extra parameter for now
28043 git-rev-parse --symbolic-full-name
28044 filter-branch: work correctly with ambiguous refnames
28045 custom pretty format: tolerate empty e-mail address
28046 Documentation: remove gitman.info with "make clean"
28047 Documentation: fix "gitlink::foobar[s]"
28048 utf8: pick_one_utf8_char()
28049 utf8_width(): allow non NUL-terminated input
28050 diff: do not chomp hunk-header in the middle of a character
28051 Update draft release notes for 1.5.4
28053 "git-apply --check" should not report "fixed"
28054 pack-objects: remove redundant and wrong call to deflateEnd()
28055 RPM spec: include gitk message files.
28059 Trim leading / off of paths in git-svn prop_walk
28061 Marco Costalba (2):
28062 Document git-reset defaults to HEAD if no commit is given
28063 git-stash: use stdout instead of stderr for non error messages
28066 git-gui: Unconditionally use absolute paths with Cygwin
28067 Documentation/Makefile - honor $DESTDIR for quick-install target
28069 Martin Koegler (4):
28070 receive-pack: check object type of sha1 before using them as commits
28071 receive-pack: reject invalid refnames
28072 parse_tag_buffer: don't parse invalid tags
28073 tree-walk: don't parse incorrect entries
28075 Michael Stefaniuc (1):
28076 git-am: Run git gc only once and not for every patch.
28078 Michele Ballabio (1):
28079 Document some default values in config.txt
28082 git-sh-setup: document git_editor() and get_author_ident_from_commit()
28083 t/t7001: avoid unnecessary ERE when using grep
28086 slightly better auto gc message
28088 Paul Mackerras (2):
28089 gitk: Recode de.po to UTF-8
28090 gitk: Restore some widget options whose defaults changed in Tk 8.5
28092 Peter Krefting (1):
28093 Added Swedish translation.
28095 Ralf Wildenhues (1):
28096 Documentation: typofix
28099 Allow git-mergetool to handle paths with a leading space
28101 Shawn O. Pearce (1):
28102 git-gui: Handle file mode changes (644->755) in diff viewer
28105 Version v1.5.4-rc2; changes since v1.5.4-rc1:
28106 ---------------------------------------------
28109 Allow selection of different cleanup modes for commit messages
28111 Arjen Laarhoven (1):
28112 Fix "git log --diff-filter" bug
28114 Charles Bailey (1):
28115 Remove old generated files from .gitignore.
28117 Gustaf Hendeby (2):
28118 Make git send-email accept $EDITOR with arguments
28119 shortlog manpage documentation: work around asciidoc markup issues
28121 Jakub Narębski (1):
28122 gitweb: fix whitespace in config_to_multi (indent with tab)
28125 clean up 1.5.4 release notes
28126 cvsimport: die on cvsps errors
28129 Don't dereference NULL upon lookup failure.
28131 Johannes Schindelin (2):
28132 Teach diff machinery to display other prefixes than "a/" and "b/"
28133 Mention git-shell's "cvs" substitution in the RelNotes
28135 Junio C Hamano (14):
28136 t4024: fix test script to use simpler sed pattern
28137 fix git commit --amend -m "new message"
28138 shell-scripts usage(): consistently exit with non-zero
28139 Documentation: ls-files -v is about "assume unchanged".
28140 Fix $EDITOR regression introduced by rewrite in C.
28141 t7005: do not exit inside test.
28142 builtin-commit: fix amending of the initial commit
28143 builtin-commit: avoid double-negation in the code.
28144 Documentation: describe 'union' low-level merge driver
28145 Fix documentation of --first-parent in git-log and copy it to git-rev-list
28146 combine-diff: Fix path quoting
28147 Fix rewrite_diff() name quoting.
28148 contrib: resurrect scripted git-revert.
28151 Linus Torvalds (1):
28152 Re(-re)*fix trim_common_tail()
28155 everyday: replace 'prune' and 'repack' with 'gc'
28157 Pierre Habouzit (3):
28158 git-tag: fix -l switch handling regression.
28159 Force the sticked form for options with optional arguments.
28160 parse-options: Add a gitcli(5) man page.
28163 Make "--pretty=format" parser a bit more careful.
28165 Shawn O. Pearce (2):
28166 Reallow git-rebase --interactive --continue if commit is unnecessary
28167 Improve error messages when int/long cannot be parsed from config
28169 Stefan Sperling (1):
28170 Small comment fix for git-cvsimport.
28172 Wincent Colaiuta (1):
28173 Emit helpful status for accidental "git stash" save
28176 Version v1.5.4-rc1; changes since v1.5.4-rc0:
28177 ---------------------------------------------
28179 Andy Whitcroft (1):
28180 git-svn: expand handling of From: and Signed-off-by:
28182 Charles Bailey (1):
28183 Fix git-instaweb breakage on MacOS X due to the limited sed functionality
28185 Christian Couder (1):
28186 git-help: add "help.format" config variable.
28188 David S. Miller (1):
28189 fast-import: fix unalinged allocation and access
28192 git-svn: unlink internal index files after operations
28193 git-svn: handle our top-level path being deleted and later re-added
28194 git-svn: avoid leaving leftover committer/author info in rebase
28195 git-svn: workaround a for broken symlinks in SVN
28196 git-svn: avoid warning when run without arguments
28198 Finn Arne Gangstad (1):
28199 Improved submodule merge support
28201 H. Merijn Brand (1):
28202 the use of 'tr' in the test suite isn't really portable
28204 J. Bruce Fields (8):
28205 whitespace: fix off-by-one error in non-space-in-indent checking
28206 whitespace: reorganize initial-indent check
28207 whitespace: minor cleanup
28208 whitespace: fix initial-indent checking
28209 whitespace: more accurate initial-indent highlighting
28210 whitespace: fix config.txt description of indent-with-non-tab
28211 builtin-apply: minor cleanup of whitespace detection
28212 builtin-apply: stronger indent-with-on-tab fixing
28214 Jakub Narębski (2):
28215 gitweb: disambiguate heads and tags withs the same name
28216 gitweb: Teach "a=blob" action to be more lenient about blob/file mime type
28219 cvsexportcommit: fix massive commits
28220 trim_common_tail: brown paper bag fix.
28221 teach bash completion to treat commands with "--" as a helper
28222 rename git-browse--help to git-help--browse
28223 clone: correctly report http_fetch errors
28224 git-send-email: avoid duplicate message-ids
28225 test "git clone -o"
28228 git-filter-branch.sh: more portable tr usage: use \012, not \n.
28230 Johannes Schindelin (4):
28231 Support config variable diff.external
28232 Document diff.external and mergetool.<tool>.path
28233 rebase -p -i: handle "no changes" gracefully
28234 git show <tag>: show the tagger
28237 threaded pack-objects: Use condition variables for thread communication.
28238 Plug a resource leak in threaded pack-objects code.
28239 Clean up documentation that references deprecated 'git peek-remote'.
28240 filter-branch: Remove broken and unnecessary summary of rewritten refs.
28242 Junio C Hamano (18):
28243 git-commit: squelch needless message during an empty merge
28244 xdl_diff: identify call sites.
28245 xdi_diff: trim common trailing lines
28246 diff --check: minor fixups
28247 Add tests for "git diff --check" with core.whitespace options
28248 xdiff tail trimming: use correct type.
28249 commit: allow --amend to reuse message from another commit
28250 remote: Fix bogus make_branch() call in configuration reader.
28251 Rename git-browse-help helper to git-browse--help
28252 Retire git-runstatus for real.
28253 Start preparing the API documents.
28254 Update draft release notes for 1.5.4
28255 Re-re-re-fix common tail optimization
28256 builtin-commit: fix summary output.
28257 builtin-commit: make summary output consistent with status
28258 Documentation/git-submodule: refer to gitmodules(5)
28259 builtin-blame.c: remove unneeded memclr()
28262 Kristian Høgsberg (1):
28263 Use a strbuf for building up section header and key/value pair strings.
28268 Linus Torvalds (1):
28269 unpack-trees: FLEX_ARRAY fix
28272 clone: fix options '-o' and '--origin' to be recognised again
28275 Fix some more memory leaks in http-push.c
28276 Fix random sha1 in error message in http-fetch and http-push
28277 Remove the default_headers variable from http-push.c
28278 Remove a CURLOPT_HTTPHEADER (un)setting
28279 Avoid redundant declaration of missing_target()
28280 Use strbuf in http code
28281 Fix various memory leaks in http-push.c and http-walker.c
28282 Move fetch_ref from http-push.c and http-walker.c to http.c
28285 provide advance warning of some future pack default changes
28286 fix style of a few comments in diff-delta.c
28287 make 'git describe --all --contains' work
28290 gitweb: Make config_to_multi return [] instead of [undef]
28292 Pierre Habouzit (1):
28293 Fix segfault in diff-delta.c when FLEX_ARRAY is 1
28295 Ralf Wildenhues (1):
28296 Fix some documentation typos.
28299 Clarify error response from 'git fetch' for bad responses
28301 Sean Estabrooks (1):
28302 Fix interactive rebase to preserve author email address
28305 Fix spelling mistakes in user manual
28307 Shawn O. Pearce (2):
28308 Avoid update hook during git-rebase --interactive
28309 Catch and handle git-commit failures in git-rebase --interactive
28311 Wincent Colaiuta (5):
28312 "diff --check" should affect exit status
28313 Unify whitespace checking
28314 Make "diff --check" output match "git apply"
28315 Use shorter error messages for whitespace problems
28316 Test interaction between diff --check and --exit-code
28319 Documentation: describe pack idx v2
28322 Version v1.5.4-rc0; changes since v1.5.3.8:
28323 -------------------------------------------
28326 fix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="
28327 Fix a crash in ls-remote when refspec expands into nothing
28328 More updates and corrections to the russian translation of git-gui
28329 Rework make_usage to print the usage message immediately
28330 Updated russian translation of git-gui
28331 Do no colorify test output if stdout is not a terminal
28332 Add a test checking if send-pack updated local tracking branches correctly
28333 Update the tracking references only if they were succesfully updated on remote
28334 Fix dependencies of parse-options test program
28335 Do not generate full commit log message if it is not going to be used
28336 Simplify crud() in ident.c
28337 Fix git-fast-export for zero-sized blobs
28339 Alexandre Julliard (12):
28340 git.el: Keep the status buffer sorted by filename.
28341 git.el: Allow selecting whether to display uptodate/unknown/ignored files.
28342 git.el: Allow the add and remove commands to be applied to ignored files.
28343 git.el: Preserve file marks when doing a full refresh.
28344 git.el: Do not print a status message on every git command.
28345 git.el: Update a file status in the git buffer upon save.
28346 git.el: Reset the permission flags when changing a file state.
28347 git.el: Fix typo in "Reverted file" message.
28348 git.el: Fix typo in git-update-saved-file error handling.
28349 git.el: Refresh only the changed file marks when marking/unmarking all.
28350 git.el: Run git-gc --auto after commits.
28351 git.el: Added a menu for git-status-mode.
28353 Andreas Ericsson (1):
28354 Simplify strchrnul() compat code
28356 André Goddard Rosa (2):
28357 Print the real filename that we failed to open.
28358 Error out when user doesn't have access permission to the repository
28361 parse_date_format(): convert a format name to an enum date_mode
28362 Make for-each-ref allow atom names like "<name>:<something>"
28363 Make for-each-ref's grab_date() support per-atom formatting
28364 Add a test script for for-each-ref, including test of date formatting
28366 Andy Whitcroft (6):
28367 Teach send-pack a mirror mode
28368 git-push: plumb in --mirror mode
28369 Add tests for git push'es mirror mode
28370 git-push: add documentation for the newly added --mirror mode
28371 git-quiltimport.sh fix --patches handling
28372 git-svn: add support for pulling author from From: and Signed-off-by:
28374 Anton Gyllenberg (1):
28375 gitview: import only one of gtksourceview and gtksourceview2
28377 Ask Bjørn Hansen (1):
28378 send-email: Don't add To: recipients to the Cc: header
28380 Benoit Sigoure (7):
28381 git-svn: add a generic tree traversal to fetch SVN properties
28382 git-svn: implement git svn create-ignore
28383 git-svn: add git svn propget
28384 git-svn: add git svn proplist
28385 git-svn: simplify the handling of fatal errors
28386 core-tutorial: Catch up with current Git
28387 git-svn: sort the options in the --help message.
28389 Björn Steinbrink (1):
28390 git config: Don't rely on regexec() returning 1 on non-match
28392 Blake Ramsdell (1):
28393 transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable
28396 git-gc: by default use safer "-A" option to repack when not --prune'ing
28397 git-gc --auto: simplify "repack" command line building
28400 Add a --dry-run option to git-send-pack.
28401 Add a --dry-run option to git-push.
28403 Brian Gernhardt (3):
28404 format-patch: Add configuration and off switch for --numbered
28405 format-patch: Test --[no-]numbered and format.numbered
28406 t3502: Disambiguate between file and rev by adding --
28409 Function for updating refs.
28410 Add tests for documented features of "git reset".
28411 Move make_cache_entry() from merge-recursive.c into read-cache.c
28412 Make "git reset" a builtin.
28413 Make builtin-tag.c use parse_options.
28415 Charles Bailey (1):
28416 Fix clone not to ignore depth when performing a local clone
28419 gitweb: the commitdiff is very commonly used, it's needed on search page, too
28422 git-p4 support for perforce renames.
28423 git-p4: Add a helper function to parse the full git diff-tree output.
28424 git-p4: Detect changes to executable bit and include them in p4 submit.
28426 Christian Couder (27):
28427 rev-list --bisect: Move finding bisection into do_find_bisection.
28428 rev-list --bisect: Move some bisection code into best_bisection.
28429 rev-list --bisect: Bisection "distance" clean up.
28430 rev-list --bisect: Fix best == NULL case.
28431 Test suite: reset TERM to its previous value after testing.
28432 rev-list: implement --bisect-all
28433 rev-list documentation: add "--bisect-all".
28434 Bisect: fix some white spaces and empty lines breakages.
28435 Bisect: implement "bisect skip" to mark untestable revisions.
28436 Bisect: refactor "bisect_write_*" functions.
28437 Bisect: refactor some logging into "bisect_write".
28438 Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".
28439 Bisect: add "bisect skip" to the documentation.
28440 Bisect: add a "bisect replay" test case.
28441 Bisect run: "skip" current commit if script exit code is 125.
28442 Bisect: add "skip" to the short usage string.
28443 Bisect reset: remove bisect refs that may have been packed.
28444 Bisect visualize: use "for-each-ref" to list all good refs.
28445 Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
28446 Bisect reset: do nothing when not bisecting.
28447 Documentation: add a new man page for "git-help"
28448 Trace and quote with argv: get rid of unneeded count argument.
28449 git-help: add -i|--info option to display info page.
28450 Documentation: describe -i/--info option to "git-help"
28451 git-help: add -w|--web option to display html man page in a browser.
28452 Use {web,instaweb,help}.browser config options.
28453 Documentation: describe -w/--web option to "git-help".
28455 Christian Stimming (14):
28456 Mark strings for translation.
28457 Makefile rules for translation catalog generation and installation.
28458 Add glossary that can be converted into a po file for each language.
28459 Add glossary translation template into git.
28460 German translation for git-gui
28461 German glossary for translation
28462 git-gui: Add more words to translation glossary
28463 git-gui: Update German glossary according to mailing list discussion
28464 git-gui: Incorporate glossary changes into existing German translation
28465 git-gui: Update German translation, including latest glossary changes
28466 git-gui: Add more terms to glossary.
28467 git-gui: Update German translation
28468 Update git-gui.pot with latest (few) string additions and changes.
28469 Update German translation. 100% completed.
28472 Remove outdated references to cogito in documentation
28474 Daniel Barkalow (23):
28475 Refactor http.h USE_CURL_MULTI fill_active_slots().
28476 Make function to refill http queue a callback
28477 Remove obsolete commit-walkers
28478 Modularize commit-walker
28479 Add uploadpack configuration info to remote.
28480 Report information on branches from remote.h
28481 Make fetch-pack a builtin with an internal API
28482 Push code for transport library
28483 Add matching and parsing for fetch-side refspec rules
28484 Add fetch methods to transport library.
28485 Make fetch a builtin
28486 Allow abbreviations in the first refspec to be merged
28487 Fix adding a submodule with a remote url
28488 Restore default verbosity for http fetches.
28489 Remove duplicate ref matches in fetch
28490 Correct handling of upload-pack in builtin-fetch-pack
28491 Miscellaneous const changes and utilities
28492 Build-in peek-remote, using transport infrastructure.
28493 Use built-in send-pack.
28494 Build-in send-pack, with an API for other programs to call.
28496 Use parseopts in builtin-push
28497 Add more checkout tests
28499 David D. Kilzer (8):
28500 git-svn log: fix ascending revision ranges
28501 git-svn log: include commit log for the smallest revision in a range
28502 git-svn log: handle unreachable revisions like "svn log"
28503 git-send-email: show all headers when sending mail
28504 git-svn: extract reusable code into utility functions
28505 git-svn info: implement info command
28506 git-svn: info --url [path]
28507 git-svn: Remove unnecessary Git::SVN::Util package
28510 diff-delta.c: pack the index structure
28511 diff-delta.c: Rationalize culling of hash buckets
28512 git-commit.sh: Shell script cleanup
28515 git-svn: Fix a typo and add a comma in an error message in git-svn
28518 gitweb: Provide title attributes for abbreviated author names.
28519 gitweb: Refactor abbreviation-with-title-attribute code.
28520 gitweb: Use chop_and_escape_str in more places.
28521 Rearrange git-format-patch synopsis to improve clarity.
28522 git-checkout: Support relative paths containing "..".
28523 git-checkout: Test for relative path use.
28524 Mention that git-rm can be an appropriate resolution as well as git-add.
28526 Dmitry Potapov (1):
28527 preserve executable bits in zip archives
28529 Douglas Stockwell (1):
28530 send-email: Add support for SSL and SMTP-AUTH
28533 Fixed a command line option type for builtin-fsck.c
28534 git-stash: Fix listing stashes
28537 git-svn: support for funky branch and project names over HTTP(S)
28538 git-svn: add tests for command-line usage of init and clone commands
28539 t9106: fix a race condition that caused svn to miss modifications
28540 git-svn: allow `info' command to work offline
28541 git-svn: replace .rev_db with a more space-efficient .rev_map format
28542 git-svn: reinstate old rev_db optimization in new rev_map
28544 Eygene Ryabinkin (2):
28545 git-svn: respect Subversion's [auth] section configuration values
28546 git-svn: use "no warnings 'once'" to disable false-positives
28548 Eyvind Bernhardsen (1):
28549 Fix mis-markup of the -p, --patch option in git-add(1)
28551 Frederick Akalin (1):
28552 gtksourceview2 support for gitview
28555 No longer install git-svnimport, move to contrib/examples
28556 git-reset: add -q option to operate quietly
28557 contrib/hooks/post-receive-email: fix typo
28558 contrib/hooks/post-receive-email: reformat to wrap comments at 76 chars
28559 contrib/hooks/post-receive-email: make subject prefix configurable
28560 hooks--update: fix test for properly set up project description file
28561 hooks--update: decline deleting tags or branches by default, add config options
28562 contrib/hooks/post-receive-email: remove cruft, $committer is not used
28563 Don't cache DESTDIR in perl/perl.mak.
28566 git-cvsimport: fix handling of user name when it is not set in CVSROOT
28569 Remove unreachable statements
28570 Use compat mkdtemp() on Solaris boxes
28572 Gustaf Hendeby (1):
28573 git-svn now reads settings even if called in subdirectory
28575 H. Merijn Brand (1):
28576 Do not rely on the exit status of "unset" for unset variables
28578 Harri Ilari Tapio Liusvaara (1):
28579 git-gui: Disambiguate "commit"
28582 git-clone: honor "--" to end argument parsing
28585 git-gui: initial version of russian translation
28587 J. Bruce Fields (3):
28588 git-rebase: support --whitespace=<option>
28589 git-rebase: fix -C option
28590 errors: "strict subset" -> "ancestor"
28592 Jakub Narębski (18):
28593 gitweb: Fix and simplify "split patch" detection
28594 gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
28595 gitweb: Add 'status_str' to parse_difftree_raw_line output
28596 gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb test
28597 gitweb: Easier adding/changing parameters to current URL
28598 gitweb: Use href(-replay=>1, page=>...) to generate pagination links
28599 gitweb: Use href(-replay=>1, action=>...) to generate alternate views
28600 gitweb: Add tests for overriding gitweb config with repo config
28601 gitweb: Read repo config using 'git config -z -l'
28602 gitweb: Use config file for repository description and URLs
28603 gitweb: Style all tables using CSS
28604 gitweb: Put project README in div.readme, fix its padding
28605 autoconf: Add tests for memmem, strtoumax and mkdtemp functions
28606 Add config_int() method to the Git perl module
28607 gitweb: Update and improve gitweb/README file
28608 contrib: Make remotes2config.sh script more robust
28609 autoconf: Add test for OLD_ICONV (squelching compiler warning)
28610 autoconf: Check asciidoc version to automatically set ASCIIDOC8
28613 remote: add 'rm' subcommand
28614 remote: document the 'rm' subcommand
28615 gc: use parse_options
28618 git-remote: exit with non-zero status after detecting error in "rm".
28619 On error, do not list all commands, but point to --help option
28622 contrib/fast-import: add perl version of simple example
28623 diffcore-rename: cache file deltas
28624 git-rebase: document suppression of duplicate commits
28625 send-pack: don't update tracking refs on error
28626 t5516: test update of local refs on push
28627 git-gc: improve wording of --auto notification
28628 Documentation/git-gc: explain --auto in description
28629 Documentation/git-gc: improve description of --auto
28630 more terse push output
28631 receive-pack: don't mention successful updates
28632 send-pack: require --verbose to show update of tracking refs
28633 git-ls-files: add --exclude-standard
28634 send-pack: track errors for each ref
28635 send-pack: check ref->status before updating tracking refs
28636 send-pack: assign remote errors to each ref
28637 make "find_ref_by_name" a public function
28638 send-pack: tighten remote error reporting
28639 send-pack: fix "everything up-to-date" message
28640 avoid "defined but not used" warning for fetch_objs_via_walker
28641 send-pack: cluster ref status reporting
28642 git-tag: test that -s implies an annotated tag
28643 Revert "t5516: test update of local refs on push"
28644 git-commit: clean up die messages
28645 Enable rewrite as well as rename detection in git-status
28646 quote_path: fix collapsing of relative paths
28647 t9600: require cvsps 2.1 to perform tests
28648 t7300: add test for clean with wildcard pathspec
28649 wt-status.c:quote_path(): convert empty path to "./"
28650 add status.relativePaths config variable
28651 git-status: documentation improvements
28652 don't mention index refreshing side effect in git-status docs
28653 Add git-browse-help to .gitignore
28654 Support GIT_PAGER_IN_USE environment variable
28655 git-svn: get color config from --get-colorbool
28656 shortlog: document -e option
28657 git-clone: print an error message when trying to clone empty repo
28659 Jeff Muizelaar (1):
28660 fix contrib/hooks/post-receive-email hooks.recipients error message
28663 hooks-pre-commit: use \t, rather than a literal TAB in regexp
28665 Johannes Schindelin (57):
28668 Teach "git remote" a mirror mode
28669 verify-tag: also grok CR/LFs in the tag signature
28670 apply: get rid of --index-info in favor of --build-fake-ancestor
28671 Move bundle specific stuff into bundle.[ch]
28672 Add bundle transport
28673 git-gui: Deiconify startup wizard so it raises to the top
28674 git-gui: add a simple msgfmt replacement
28675 rebase -i: commit when continuing after "edit"
28676 rebase -i: style fixes and minor cleanups
28677 rebase -i: Fix numbers in progress report
28678 rebase -i: avoid exporting GIT_AUTHOR_* variables
28679 rebase -i: work on a detached HEAD
28680 rebase -i: support single-letter abbreviations for the actions
28681 Introduce remove_dir_recursively()
28682 fetch/push: readd rsync support
28683 Support cvs via git-shell
28684 Fix compilation when NO_CURL is defined
28685 cvsexportcommit: get rid of temporary directory
28686 fetch: if not fetching from default remote, ignore default merge
28687 Deduce exec_path also from calls to git with a relative path
28688 Add tests for parse-options.c
28689 parse-options: Allow abbreviated options when unambiguous
28690 po2msg: ignore entries marked with "fuzzy"
28691 po2msg: ignore untranslated messages
28692 po2msg: actually output statistics
28693 git-reset: do not be confused if there is nothing to reset
28694 Split off the pretty print stuff into its own file
28695 parse-options: abbreviation engine fix.
28696 builtin-reset: do not call "ls-files --unmerged"
28697 builtin-reset: avoid forking "update-index --refresh"
28698 Deprecate git-lost-found
28699 rebase: operate on a detached HEAD
28700 builtin-blame: set up the work_tree before the first file access
28701 rebase: fix "rebase --continue" breakage
28702 Close files opened by lock_file() before unlinking.
28703 rebase -i: move help to end of todo file
28704 launch_editor(): read the file, even when EDITOR=:
28705 builtin-commit: fix reflog message generation
28706 git status: show relative paths when run in a subdirectory
28707 builtin-commit: fix --signoff
28708 builtin-commit --s: add a newline if the last line was not a S-o-b
28709 builtin-commit: resurrect behavior for multiple -m options
28710 builtin-commit: Add newline when showing which commit was created
28711 Replace "runstatus" with "status" in the tests
28712 filter-branch: fix dirty way to provide the helpers to commit filters
28713 git checkout's reflog: even when detaching the HEAD, say from where
28714 bash completion: add diff options
28715 Replace instances of export VAR=VAL with VAR=VAL; export VAR
28716 Teach 'git pull' about --rebase
28717 rebase -i: give rerere a chance
28718 receive-pack: allow deletion of corrupt refs
28719 Add "--expire <time>" option to 'git prune'
28720 Add 'git fast-export', the sister of 'git fast-import'
28721 fast-export: rename the signed tag mode 'ignore' to 'verbatim'
28722 Allow ':/<oneline-prefix>' syntax to work with save_commit_buffer == 0
28724 Johannes Sixt (38):
28725 git-gui: Change main window layout to support wider screens
28726 gitk: Do not pick up file names of "copy from" lines
28727 Change git_connect() to return a struct child_process instead of a pid_t.
28728 Use start_command() in git_connect() instead of explicit fork/exec.
28729 Use start_command() to run content filters instead of explicit fork/exec.
28730 Use run_command() to spawn external diff programs instead of fork/exec.
28731 Use start_comand() in builtin-fetch-pack.c instead of explicit fork/exec.
28732 Have start_command() create a pipe to read the stderr of the child.
28733 upload-pack: Use start_command() to run pack-objects in create_pack_file().
28734 Add infrastructure to run a function asynchronously.
28735 Use the asyncronous function infrastructure in builtin-fetch-pack.c.
28736 upload-pack: Move the revision walker into a separate function.
28737 upload-pack: Run rev-list in an asynchronous function.
28738 t0021-conversion.sh: Test that the clean filter really cleans content.
28739 Avoid a dup2(2) in apply_filter() - start_command() can do it for us.
28740 Use the asyncronous function infrastructure to run the content filter.
28741 Fix an infinite loop in sq_quote_buf().
28742 upload-pack: Use finish_{command,async}() instead of waitpid().
28743 Give git-am back the ability to add Signed-off-by lines.
28744 git-clean: Fix error message if clean.requireForce is not set.
28745 Fix preprocessor logic that determines the availablity of strchrnul().
28746 t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
28747 t7501-commit.sh: Not all seds understand option -i
28748 t5302-pack-index: Skip tests of 64-bit offsets if necessary.
28749 Skip t3902-quoted.sh if the file system does not support funny names.
28750 Use is_absolute_path() in sha1_file.c.
28751 Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
28752 builtin run_command: do not exit with -1.
28753 Allow a relative builtin template directory.
28754 Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG.
28755 Allow ETC_GITCONFIG to be a relative path.
28756 refs.c: Remove unused get_ref_sha1()
28757 fetch-pack: Prepare for a side-band demultiplexer in a thread.
28758 Flush progress message buffer in display().
28759 git-gui: Improve the application icon on Windows.
28760 git-commit: Allow to amend a merge commit that does not change the tree
28761 for-each-ref: Fix quoting style constants.
28762 Fix a typo in checkout.sh and cleanup one-line help messages
28765 Update manpages to reflect new short and long option aliases
28766 Documentation: Fix references to deprecated commands
28768 Jonathan del Strother (2):
28769 Fixing path quoting in git-rebase
28770 gitk: Add support for OS X mouse wheel
28773 Add post-merge hook, related documentation, and tests.
28774 Added example hook script to save/restore permissions/ownership.
28775 post-checkout hook, tests, and docs
28776 Minor usage update in setgitperms.perl
28778 Junio C Hamano (157):
28779 Keep last used delta base in the delta window
28780 git-gui po/README: Guide to translators
28782 Implement git gc --auto
28783 Invoke "git gc --auto" from commit, merge, am and rebase.
28784 archive - leakfix for format_subst()
28785 git-commit: Allow partial commit of file removal.
28786 An additional test for "git-reset -- path"
28788 git-commit: partial commit of paths only removed from the index
28789 Document ls-files --with-tree=<tree-ish>
28790 builtin-pack-objects.c: avoid bogus gcc warnings
28791 stash: implement "stash create"
28792 rebase: allow starting from a dirty tree.
28793 Export matches_pack_name() and fix its return value
28794 pack-objects --keep-unreachable
28795 repack -A -d: use --keep-unreachable when repacking
28796 git-gc --auto: move threshold check to need_to_gc() function.
28797 git-gc --auto: add documentation.
28798 git-gc --auto: protect ourselves from accumulated cruft
28799 git-gc --auto: restructure the way "repack" command line is built.
28800 git-gc --auto: run "repack -A -d -l" as necessary.
28801 builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.
28802 builtin-for-each-ref.c::copy_name() - do not overstep the buffer.
28803 git-remote rm: add tests and minor fix-ups
28804 Start RelNotes for 1.5.4
28805 strbuf_setlen(): do not barf on setting length of an empty buffer to 0
28806 send-email --smtp-server-port: allow overriding the default port
28807 rerere: Fix use of an empty strbuf.buf
28808 git-am: make the output quieter.
28809 bundle transport: fix an alloc_ref() call
28810 Update stale documentation link in the k.org site
28811 git-am: fix typo in the previous one.
28812 dateformat: parse %(xxdate) %(yydate:format) correctly
28813 builtin-apply: fix conversion error in strbuf series
28814 Update state documentation link for 1.5.3.4
28815 k.org git toppage: Add link to 1.5.3 release notes.
28816 help: remove extra blank line after "See 'git --help'" message
28817 revert/cherry-pick: work on merge commits as well
28818 git-fetch: do not fail when remote branch disappears
28819 RelNotes-1.5.4: describe recent updates
28820 git-gui: Update Japanese strings (part 2)
28821 Revert "rebase: allow starting from a dirty tree."
28822 git-merge: no reason to use cpio anymore
28823 format-patch -s: add MIME encoding header if signer's name requires so
28824 cherry-pick/revert -m: add tests
28825 test format-patch -s: make sure MIME content type is shown as needed
28826 War on whitespace: first, a bit of retreat.
28827 git-diff: complain about >=8 consecutive spaces in initial indent
28828 core.whitespace: add test for diff whitespace error highlighting
28829 clean: require -f to do damage by default
28830 gc: --prune prunes unreferenced objects.
28831 scripts: Add placeholders for OPTIONS_SPEC
28832 git-rev-parse --parseopt
28833 git-sh-setup: fix parseopt `eval` string underquoting
28834 send-pack: segfault fix on forced push
28835 Style: place opening brace of a function definition at column 1
28836 git-am: -i does not take a string parameter.
28837 Update draft release notes for 1.5.4
28838 Documentation: lost-found is now deprecated.
28839 Make check-docs target detect removed commands
28840 Documentation: remove documentation for removed tools.
28841 git-commit: a bit more tests
28842 Resurrect git-revert.sh example and add comment to builtin-revert.c
28843 core.excludesfile clean-up
28844 Fix per-directory exclude handing for "git add"
28845 git-bisect: war on "sed"
28846 git-bisect: use update-ref to mark good/bad commits
28847 git-bisect: modernize branch shuffling hack
28848 Update draft release notes for 1.5.4
28849 Draft release notes: fix clean.requireForce description
28850 Update draft release notes for 1.5.4
28851 Move gitk to its own subdirectory
28852 git-clean: Fix error message if clean.requireForce is not set.
28853 git-compat-util.h: auto-adjust to compiler support of FLEX_ARRAY a bit better
28854 Fix "quote" misconversion for rewrite diff output.
28855 Make test scripts executable.
28856 file_exists(): dangling symlinks do exist
28857 builtin-commit: do not color status output shown in the message template
28858 builtin-commit: run commit-msg hook with correct message file
28859 Export three helper functions from ls-files
28860 Fix add_files_to_cache() to take pathspec, not user specified list of files
28861 builtin-commit: fix partial-commit support
28862 Addendum to "MaintNotes"
28863 git-add -i: allow multiple selection in patch subcommand
28864 git-branch --contains=commit
28865 git-branch --contains: doc and test
28866 builtin-tag: accept and process multiple -m just like git-commit
28867 Add a few more tests for git-commit
28868 builtin-apply: rename "whitespace" variables and fix styles
28869 t4119: correct overeager war-on-whitespace
28870 builtin-apply: teach whitespace_rules
28871 core.whitespace: documentation updates.
28872 Deprecate peek-remote
28873 Update draft release notes for 1.5.4
28874 builtin-add: fix command line building to call interactive
28875 add -i: Fix running from a subdirectory
28876 "git-tag -s" should create a signed annotated tag
28877 revert/cherry-pick: do not mention the original ref
28878 "color.diff = true" is not "always" anymore.
28879 git-config --get-color: get configured color
28880 dir.c: minor clean-up
28881 per-directory-exclude: lazily read .gitignore files
28882 Update draft release notes for 1.5.4
28883 Resurrect peek-remote
28884 Consolidate command list to one.
28885 Update draft release notes for 1.5.4
28886 rename: Break filepairs with different types.
28887 git-am: catch missing author date early.
28888 Fix --signoff in builtin-commit differently.
28889 git-commit: Allow to amend a merge commit that does not change the tree
28890 git-commit --allow-empty
28891 git-commit --allow-empty
28892 git-commit documentation: fix unfinished sentence.
28893 Add git-fast-export to list of commands.
28894 Update draft release notes for 1.5.4
28895 Run the specified perl in Documentation/
28896 Formatting fix for Documentation/git-help.txt
28897 Documentation: rerere is enabled by default these days.
28898 Documentation/git.txt: typofix
28899 t5510: add a bit more tests for fetch
28900 git-cvsserver runs hooks/post-update
28901 Revert "git-am: catch missing author date early."
28902 Documentation: color.* = true means "auto"
28903 git config --get-colorbool
28904 Color support for "git-add -i"
28905 git-clean: Honor pathspec.
28906 config --get-colorbool: diff.color is a deprecated synonym to color.diff
28907 Use gitattributes to define per-path whitespace rule
28908 hg-to-git: handle an empty dir in hg.
28909 do not discard status in fetch_refs_via_pack()
28910 git-status documentation: mention subdirectory behaviour
28911 Update draft release notes to 1.5.4
28912 git-bisect visualize: work in non-windowed environments better
28913 mailmap: fix bogus for() loop that happened to be safe by accident
28914 shortlog: code restructuring and clean-up
28915 git-shortlog -e: show e-mail address as well
28916 ls-remote: resurrect pattern limit support
28917 Fix commit-msg hook to allow editing
28918 Re-fix "builtin-commit: fix --signoff"
28920 Update draft Release Notes for 1.5.4
28921 Documentation: add gitman.info target
28922 git-help -i: invoke info with document and node name
28923 git-help -i: show info documentation from matching version of git
28924 send-email: do not muck with initial-reply-to when unset.
28925 commit: do not add extra LF at the end of the summary.
28926 Support a merge with conflicting gitlink change
28927 blame: drop blob data after passing blame to the parent
28928 shortlog: default to HEAD when the standard input is a tty
28929 git-diff --numstat -z: make it machine readable
28930 disable t9119 for now.
28931 Documentation: rename git.texi to user-manual.texi
28932 git.spec.in: remove python_path
28933 git-help -w: do not require to be in git repository
28934 RPM spec: Adjust htmldir
28938 git-p4: Fix typo in --detect-labels
28939 git-stash: Display help message if git-stash is run with wrong sub-commands
28942 Updated Russian translation.
28944 Konstantin V. Arkhipov (1):
28945 git-svn's dcommit must use subversion's config
28947 Kristian Høgsberg (18):
28948 Enable wt-status output to a given FILE pointer.
28949 Enable wt-status to run against non-standard index file.
28950 Add strbuf_read_file().
28951 Clean up stripspace a bit, use strbuf even more.
28952 Introduce entry point add_interactive and add_files_to_cache
28953 Export rerere() and launch_editor().
28954 Port builtin-add.c to use the new option parser.
28955 Add testcase for amending and fixing author in git commit.
28956 Export launch_editor() and make it accept ':' as a no-op editor.
28957 Port git commit to C.
28958 builtin-commit: Refresh cache after adding files.
28959 Call refresh_cache() when updating the user index for --only commits.
28960 builtin-commit: Clean up an unused variable and a debug fprintf().
28961 t7501-commit: Add test for git commit <file> with dirty index.
28962 builtin-commit: Include the diff in the commit message when verbose.
28963 Fix off-by-one error when truncating the diff out of the commit message.
28964 Use a strbuf for copying the command line for the reflog.
28965 Rewrite builtin-fetch option parsing to use parse_options().
28967 Kristof Provost (1):
28968 makefile: Add a cscope target
28971 git-svn: add support for --first-parent
28972 git-svn: always use --first-parent
28973 Add test-script for git-merge porcelain
28974 git-merge: fix faulty SQUASH_MSG
28975 git-merge: refactor option parsing
28976 git-merge: add support for branch.<name>.mergeoptions
28977 git-merge: add support for --commit and --no-squash
28978 git-merge: add --ff and --no-ff options
28979 Make merge-recursive honor diff.renamelimit
28980 Teach git-pull about --[no-]ff, --no-squash and --commit
28981 for-each-ref: fix setup of option-parsing for --sort
28984 Speedup scanning for excluded files.
28986 Linus Torvalds (18):
28987 optimize diffcore-delta by sorting hash entries.
28988 Add 'diffcore.h' to LIB_H
28989 Split out "exact content match" phase of rename detection
28990 Ref-count the filespecs used by diffcore
28991 copy vs rename detection: avoid unnecessary O(n*m) loops
28992 Do linear-time/space rename logic for exact renames
28993 Do exact rename detection regardless of rename limits
28994 Fix ugly magic special case in exact rename detection
28995 Do the fuzzy rename detection limits with the exact renames removed
28996 Simplify topo-sort logic
28997 Add "--early-output" log flag for interactive GUI use
28998 Enhance --early-output format
28999 revision walker: mini clean-up
29000 Fix rev-list when showing objects involving submodules
29001 Fix parent rewriting in --early-output
29002 Fix a pathological case in git detecting proper renames
29003 Fix a pathological case in git detecting proper renames
29004 "git tag -u keyname" broken
29007 gitweb: speed up project listing on large work trees by limiting find depth
29009 Marius Storm-Olsen (2):
29010 Add 'git-p4 commit' as an alias for 'git-p4 submit'
29011 Teach core.autocrlf to 'git blame'
29014 git-submodule - allow a relative path as the subproject url
29017 Move convert-objects to contrib.
29018 rebase -i: create .dotest-merge after validating options.
29020 Matthias Kestenholz (1):
29021 Documentation: add --patch option to synopsis of git-add
29023 Michael Gebetsroither (1):
29024 hg-to-git speedup through selectable repack intervals
29026 Michael W. Olson (2):
29027 git-rebase--interactive.sh: Quote arguments to test
29028 Documentation/git-tag.txt: Document how to backdate tags
29030 Michael Witten (2):
29031 git-cvsexportcommit.perl: git-apply no longer needs --binary
29032 git-cvsserver runs hooks/post-receive
29034 Michal Vitecek (1):
29035 Don't use "<unknown>" for placeholders and suppress printing of empty user formats.
29037 Michele Ballabio (7):
29038 git-gui: remove dots in some UI strings
29039 git-gui: add some strings to translation
29040 git-gui: fix typo in lib/blame.tcl
29041 git-gui: update Italian translation
29042 test-lib.sh: move error line after error() declaration
29043 git-gui: fix a typo in lib/commit.tcl
29044 git-gui: update it.po and glossary/it.po
29047 instaweb: allow for use of auto-generated scripts
29048 instaweb: support for Ruby's WEBrick server
29051 Reuse previous annotation when overwriting a tag
29052 Add tests for git tag
29053 Refactor working tree setup
29054 Use setup_work_tree() in builtin-ls-files.c
29055 Don't always require working tree for git-rm
29056 Make git-blame fail when working tree is needed and we're not in one
29057 Small code readability improvement in show_reference() in builtin-tag.c
29058 Do git reset --hard HEAD when using git rebase --skip
29059 Fix and improve t7004 (git-tag tests)
29060 git-send-email.perl: Really add angle brackets to In-Reply-To if necessary
29061 Cleanup variables in http.[ch]
29062 Fix small memory leaks induced by diff_tree_setup_paths
29063 Fix XML parser leaks in http-push
29066 Hungarian translation of git-gui
29067 git-send-email: add a new sendemail.to configuration variable
29068 Include diff options in the git-log manpage
29069 Update Hungarian translation. 100% completed.
29071 Nanako Shiraishi (3):
29072 Japanese translation of git-gui
29073 git-gui: Update Japanese strings
29074 Update ja.po for git-gui
29076 Nguyễn Thái Ngọc Duy (3):
29077 contrib/fast-import: add simple shell example
29078 git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
29079 Remove repo version check from setup_git_directory
29081 Nicolas Pitre (42):
29082 straighten the list of objects to deltify
29083 localize window memory usage accounting
29084 rearrange delta search progress reporting
29085 basic threaded delta search
29086 threaded delta search: refine work allocation
29087 threaded delta search: better chunck split point
29088 threaded delta search: specify number of threads at run time
29089 fix threaded delta search locking
29090 threaded delta search: add pack.threads config variable
29091 threaded delta search: proper locking for cache accounting
29092 more compact progress display
29093 cope with multiple line breaks within sideband progress messages
29094 pack-objects: no delta possible with only one object in the list
29095 pack-objects.c: fix some global variable abuse and memory leaks
29096 fix const issues with some functions
29097 fix for more minor memory leaks
29098 prune-packed: don't call display_progress() for every file
29099 make struct progress an opaque type
29100 relax usage of the progress API
29101 add throughput to progress display
29102 add throughput display to index-pack
29103 add some copyright notice to the progress display code
29104 add throughput display to git-push
29105 return the prune-packed progress display to the inner loop
29106 make sure throughput display gets updated even if progress doesn't move
29107 Show total transferred as part of throughput progress
29108 make the pack index version configurable
29109 pack-objects: get rid of an ugly cast
29110 git-fetch: more terse fetch output
29111 fix display overlap between remote and local progress
29112 sideband.c: ESC is spelled '\033' not '\e' for portability.
29113 make display of total transferred more accurate
29114 remove dead code from the csum-file interface
29115 restore fetching with thin-pack capability
29116 make display of total transferred fully accurate
29117 nicer display of thin pack completion
29118 add a howto document about corrupted blob recovery
29119 rehabilitate some t5302 tests on 32-bit off_t machines
29120 pack-objects: fix delta cache size accounting
29121 pack-objects: reverse the delta search sort list
29122 pack-objects: fix threaded load balancing
29123 pack-objects: more threaded load balancing fix with often changed paths
29125 Paolo Ciarrocchi (1):
29126 Italian translation of git-gui
29129 git-stash: do not get fooled with "color.diff = true"
29130 Set OLD_ICONV on Cygwin.
29132 Paul Mackerras (37):
29133 gitk: Establish and use global left-to-right ordering for commits
29134 gitk: Improve the drawing of links to parent lines
29135 gitk: Eliminate diagonal arrows
29136 gitk: Get rid of idrowranges and rowrangelist
29137 gitk: Get rid of idinlist array
29138 gitk: Fix some problems with the display of ids as links
29139 gitk: Get rid of the rowchk array
29140 gitk: Do only the parts of the layout that are needed
29141 gitk: Fix bug causing incorrect ref list contents when switching view
29142 gitk: Fix bug causing undefined variable error when cherry-picking
29143 gitk: Add a cache for the topology info
29144 gitk: Make it possible to lay out all the rows we have received so far
29145 gitk: Fix bugs in setting rowfinal
29146 gitk: Get rid of lookingforhead, use commitinterest instead
29147 gitk: Fix bug in generating patches
29148 gitk: Simplify highlighting interface and combine with Find function
29149 gitk: Fix a couple of bugs
29150 gitk: Add progress bars for reading in stuff and for finding
29151 gitk: Fix the tab setting in the diff display window
29152 gitk: Fix bug causing Tcl error when changing find match type
29153 gitk: Use named fonts instead of the font specification
29154 gitk: Keep track of font attributes ourselves instead of using font actual
29155 gitk: Add a font chooser
29156 gitk: Fix bug where the last few commits would sometimes not be visible
29157 gitk: Get rid of the diffopts variable
29158 gitk: Fix Tcl error: can't unset findcurline
29159 gitk: Check that we are running on at least Tcl/Tk 8.4
29160 gitk: Avoid an error when cherry-picking if HEAD has moved on
29161 gitk: Fix "can't unset prevlines(...)" Tcl error
29162 gitk: Limit diff display to listed paths by default
29163 gitk: Ensure tabstop setting gets restored by Cancel button
29164 gitk: Integrate the reset progress bar in the main frame
29165 gitk: Use the status window for other functions
29166 gitk: Fix some bugs with path limiting in the diff display
29167 gitk: Fix a couple more bugs in the path limiting
29168 gitk: Simplify the code for finding commits
29169 gitk: Use the UI font for the diff/old version/new version radio buttons
29171 Pierre Habouzit (80):
29172 Rework strbuf API and semantics.
29173 Simplify strbuf uses in archive-tar.c using strbuf API
29174 fast-import: Use strbuf API, and simplify cmd_data()
29175 mktree: Simplify write_tree() using strbuf API
29176 Use strbuf API in apply, blame, commit-tree and diff
29177 Use strbuf API in buitin-rerere.c
29178 Use strbuf API in cache-tree.c
29179 Strbuf API extensions and fixes.
29180 Change semantics of interpolate to work like snprintf.
29181 Rework pretty_print_commit to use strbufs instead of custom buffers.
29182 Use strbuf_read in builtin-fetch-tool.c.
29183 Use strbufs to in read_message (imap-send.c), custom buffer--.
29184 Replace all read_fd use with strbuf_read, and get rid of it.
29185 New strbuf APIs: splice and attach.
29186 Rewrite convert_to_{git,working_tree} to use strbuf's.
29187 Now that cache.h needs strbuf.h, remove useless includes.
29188 builtin-apply: use strbuf's instead of buffer_desc's.
29189 Refactor replace_encoding_header.
29190 Remove preemptive allocations.
29191 Drop strbuf's 'eof' marker, and make read_line a first class citizen.
29192 fast-import was using dbuf's, replace them with strbuf's.
29193 fast-import optimization:
29194 Add xmemdupz() that duplicates a block of memory, and NUL terminates it.
29195 Use xmemdupz() in many places.
29196 Fix the expansion pattern of the pseudo-static path buffer.
29197 nfv?asprintf are broken without va_copy, workaround them.
29198 strbuf API additions and enhancements.
29199 Rework unquote_c_style to work on a strbuf.
29200 Full rework of quote_c_style and write_name_quoted.
29201 sq_quote_argv and add_to_string rework with strbuf's.
29203 Make builtin-rerere use of strbuf nicer and more efficient.
29204 Small cache_tree_write refactor.
29205 double free in builtin-update-index.c
29206 strbuf change: be sure ->buf is never ever NULL.
29207 strbuf_read_file enhancement, and use it.
29208 Make read_patch_file work on a strbuf.
29209 Fix in-place editing functions in convert.c
29210 Add some fancy colors in the test library when terminal supports it.
29211 Support a --quiet option in the test-suite.
29212 fast-import.c: fix regression due to strbuf conversion
29213 Add a simple option parser.
29214 parse-options: be able to generate usages automatically
29215 parse-options: make some arguments optional, add callbacks.
29216 Add shortcuts for very often used options.
29217 parse-options: allow callbacks to take no arguments at all.
29218 Make builtin-rm.c use parse_options.
29219 Make builtin-mv.c use parse-options
29220 Make builtin-branch.c use parse_options.
29221 Make builtin-describe.c use parse_options
29222 Make builtin-revert.c use parse_options.
29223 Make builtin-update-ref.c use parse_options
29224 Make builtin-symbolic-ref.c use parse_options.
29225 Make builtin-for-each-ref.c use parse-opts.
29226 Make builtin-fsck.c use parse_options.
29227 Make builtin-count-objects.c use parse_options.
29228 Make builtin-name-rev.c use parse_options.
29229 Make builtin-pack-refs.c use parse_options.
29230 git-fetch: be even quieter.
29231 Some better parse-options documentation.
29232 Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts.
29233 Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt
29234 Migrate git-clean.sh to use git-rev-parse --parseopt.
29235 Migrate git-clone to use git-rev-parse --parseopt
29236 Migrate git-am.sh to use git-rev-parse --parseopt
29237 Migrate git-merge.sh to use git-rev-parse --parseopt
29238 Migrate git-instaweb.sh to use git-rev-parse --parseopt
29239 Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash
29240 Migrate git-quiltimport.sh to use git-rev-parse --parseopt
29241 Migrate git-repack.sh to use git-rev-parse --parseopt
29242 sh-setup: don't let eval output to be shell-expanded.
29243 parse-options new features.
29244 Use OPT_SET_INT and OPT_BIT in builtin-branch
29245 Use OPT_BIT in builtin-for-each-ref
29246 Use OPT_BIT in builtin-pack-refs
29247 Make the diff_options bitfields be an unsigned with explicit masks.
29248 Reorder diff_opt_parse options more logically per topics.
29249 parse-options: Allow to hide options from the default usage.
29250 builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.
29251 Invert numbers and names in the git-shortlog summary mode.
29254 Open external merge tool with original file extensions for all three files
29256 Ralf Wildenhues (10):
29257 manual: Fix or remove em dashes.
29258 Fix some typos, punctuation, missing words, minor markup.
29259 Fix wording in push definition.
29260 manual: Fix example finding commits referencing given content.
29261 manual: add some markup.
29262 manual: use 'URL' instead of 'url'.
29263 git-cherry-pick: improve description of -x.
29264 Fix minor nits in configure.ac
29265 git-bisect.sh: Fix sed script to work with AIX and BSD sed.
29266 Document all help keys in "git add -i" patch mode.
29269 Export format_commit_message()
29270 archive: specfile support (--pretty=format: in archive files)
29271 Remove unused function convert_sha1_file()
29273 archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
29274 archive: rename attribute specfile to export-subst
29275 archive: fix subst file generation
29276 Correct some sizeof(size_t) != sizeof(unsigned long) typing errors
29278 --pretty=format: on-demand format expansion
29279 --pretty=format: parse commit message only once
29280 add strbuf_adddup()
29281 --format=pretty: avoid calculating expensive expansions twice
29284 Define NO_MEMMEM of FreeBSD as it lacks the function
29286 Robert Schiele (2):
29287 git-gui: install-sh from automake does not like -m755
29288 install-sh from automake does not like -m without delimiting space
29290 Robin Rosenberg (1):
29291 cvsexportcommit: Add switch to specify CVS workdir
29294 git-svn: fix test for trunk svn (commit message not needed)
29295 git-svn: fix test for trunk svn (transaction out of date)
29296 git-svn: handle changed svn command-line syntax
29297 gitk: disable colours when calling git log
29298 Allow HTTP proxy to be overridden in config
29299 Add remote.<name>.proxy
29301 Scott R Parish (7):
29302 "git" returns 1; "git help" and "git help -a" return 0
29303 remove unused/unneeded "pattern" argument of list_commands
29304 "current_exec_path" is a misleading name, use "argv_exec_path"
29305 list_commands(): simplify code by using chdir()
29306 use only the $PATH for exec'ing git commands
29307 include $PATH in generating list of commands for "help -a"
29308 shell should call the new setup_path() to setup $PATH
29310 Sergei Organov (7):
29311 core-tutorial.txt: Fix git-show-branch example and its description
29312 user-manual.txt: fix a few mistakes
29313 user-manual: minor rewording for clarity.
29314 Documentation: customize diff-options depending on particular command
29315 user-manual.txt: minor clarification.
29316 Documentation: fix git-clone manpage not to refer to itself
29317 Let git-help prefer man-pages installed with this version of git
29320 Add more tests for git-clean
29321 Make git-clean a builtin
29322 Teach git clean to use setup_standard_excludes()
29323 Make git status usage say git status instead of git commit
29325 Shawn O. Pearce (106):
29326 git-gui: Locate the library directory early during startup
29327 git-gui: Initialize Tcl's msgcat library for internationalization
29328 git-gui: Update po/README as symlink process is not necessary
29329 git-gui: Correct stock message for 'Invalid font specified in %s'
29330 git-gui: Quiet the msgfmt part of the make process
29331 git-gui: Ensure msgfmt failure stops GNU make
29332 Define NO_MEMMEM on Darwin as it lacks the function
29333 git-gui: Mark revision chooser tooltip for translation
29334 git-gui: Localize commit/author dates when displaying them
29335 git-gui: Support context-sensitive i18n
29336 git-gui: Document the new i18n context support
29337 git-gui: Make the tree browser also use lightgray selection
29338 git-gui: Paper bag fix missing translated strings
29339 Correct builtin-fetch to handle + in refspecs
29340 Fix off by one bug in reflog messages written by builtin-fetch
29341 Remove unnecessary debugging from builtin-fetch
29342 Remove unused unpacklimit variable from builtin-fetch
29343 Replace custom memory growth allocator with ALLOC_GROW
29344 Simplify fetch transport API to just one function
29345 Refactor index-pack "keep $sha1" handling for reuse
29346 Remove pack.keep after ref updates in git-fetch
29347 Always ensure the pack.keep file is removed by git-fetch
29348 Fix builtin-fetch memory corruption by not overstepping array
29349 Backup the array passed to fetch_pack so we can free items
29350 Properly cleanup in http_cleanup so builtin-fetch does not segfault
29351 Don't bother passing ref log details to walker in builtin-fetch
29352 Cleanup duplicate initialization code in transport_get
29353 Add transport.h to LIB_H as transport.o is in LIB_OBJS
29354 Remove unnecessary 'fetch' argument from transport_get API
29355 Allow builtin-fetch to work on a detached HEAD
29356 Don't configure remote "." to fetch everything to itself
29357 Remove more debugging from builtin-fetch
29358 builtin-fetch: Don't segfault on "fetch +foo"
29359 Don't attempt to merge non-existant remotes in t5515
29360 Correct handling of branch.$name.merge in builtin-fetch
29361 Avoid printing unnecessary warnings during fetch and push
29362 Use 'unsigned:1' when we mean boolean options
29363 Rename remote.uri to remote.url within remote handling internals
29364 Refactor struct transport_ops inlined into struct transport
29365 Always obtain fetch-pack arguments from struct fetch_pack_args
29366 Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
29367 Fix memory leaks when disconnecting transport instances
29368 git-gui: Fix missing i18n markup in push/fetch windows
29369 git-gui: Support native Win32 Tcl/Tk under Cygwin
29370 git-gui: Refactor some UI init to occur earlier
29371 git-gui: Allow users to choose/create/clone a repository
29372 git-gui: Avoid console scrollbars unless they are necessary
29373 git-gui: Don't bother showing OS error message about hardlinks
29374 git-gui: Keep the UI responsive while counting objects in clone
29375 git-gui: Copy objects/info/alternates during standard clone
29376 Cleanup style nit of 'x == NULL' in remote.c
29377 Cleanup unnecessary break in remote.c
29378 Prevent send-pack from segfaulting when a branch doesn't match
29379 git-gui: Don't delete console window namespaces too early
29380 git-gui: Don't delete scrollbars in console windows
29381 git-gui: Switch the git-gui logo to Henrik Nyh's logo
29382 git-gui: Make the status bar easier to read in the setup wizard
29383 git-gui: Use Henrik Nyh's git logo icon on Windows systems
29384 git-gui: Support a native Mac OS X application bundle
29385 git-gui: Refer to ourselves as "Git Gui" and not "git-gui"
29386 git-gui: Allow forced push into remote repository
29387 git-gui: Refactor Henrik Nyh's logo into its own procedure
29388 git-gui: Refactor about dialog code into its own module
29389 git-gui: Include our Git logo in the about dialog
29390 git-gui: Use progress meter in the status bar during index updates
29391 git-gui: Consolidate the Fetch and Push menus into a Remote menu
29392 git-gui: Bind Cmd-, to Preferences on Mac OS X
29393 git-gui: Shorten the staged/unstaged changes title bar text
29394 git-gui: Updated po strings based on current sources
29395 git-gui: Move load_config procedure below git-version selection
29396 git-gui: Refactor git-config --list parsing
29397 git-gui: Support LFs embedded in config file values
29398 git-gui: Change repository browser radio buttons to hyperlinks
29399 git-gui: Offer repository management features in menu bar
29400 git-gui: Fix bind errors when switching repository chooser panels
29401 git-gui: Disable the text widget in the repository chooser
29402 git-gui: Bind n/c/o accelerators in repository chooser
29403 git-gui: Ensure copyright message is correctly read as UTF-8
29404 git-gui: Use proper Windows shortcuts instead of bat files
29405 git-gui: Support cloning Cygwin based work-dirs
29406 git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
29407 git-gui: Honor a config.mak in git-gui's top level
29408 Fix 'push --all branch...' error handling
29409 Support 'push --dry-run' for rsync transport
29410 Support 'push --dry-run' for http transport
29411 git-gui: Paper bag fix the global config parsing
29412 Change 'Deltifying objects' to 'Compressing objects'
29413 Teach prune-packed to use the standard progress meter
29414 Stop displaying "Pack pack-$ID created." during git-gc
29415 Avoid scary errors about tagged trees/blobs during git-fetch
29416 Define compat version of mkdtemp for systems lacking it
29417 Improved const correctness for strings
29418 Use PRIuMAX instead of 'unsigned long long' in show-index
29419 git-gui: Make sure we get errors from git-update-index
29420 git-gui: Protect against bad translation strings
29421 git-gui: Allow users to set font weights to bold
29422 Reteach builtin-ls-remote to understand remotes
29423 git-gui: Bind Meta-T for "Stage To Commit" menu action
29424 git-fetch: Always fetch tags if the object they reference exists
29425 run-command: Support sending stderr to /dev/null
29426 rev-list: Introduce --quiet to avoid /dev/null redirects
29427 git-fetch: avoid local fetching from alternate (again)
29428 Handle broken vsnprintf implementations in strbuf
29429 Fix warning about bitfield in struct ref
29431 Remove git-status from list of scripts as it is builtin
29433 Simon Hausmann (10):
29434 git-p4: Always call 'p4 sync ...' before submitting to Perforce.
29435 git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
29436 git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
29437 git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
29438 git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
29439 git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
29440 git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
29441 git-p4: Added support for automatically importing newly appearing perforce branches.
29442 git-p4: When skipping a patch as part of "git-p4 submit" make sure we correctly revert to the previous state of the files using "p4 revert".
29443 git-p4: Fix direct import from perforce after fetching changes through git from origin
29446 Make mailsplit and mailinfo strip whitespace from the start of the input
29448 Stefan Sperling (1):
29449 Fix pool handling in git-svnimport to avoid memory leaks.
29451 Steffen Prohaska (16):
29452 git-gui: add directory git-gui is located in to PATH (on Windows)
29453 git-gui: set NO_MSGFMT to force using pure tcl replacement in msysgit
29454 git-gui: add mingw specific startup wrapper
29455 git-gui: offer a list of recent repositories on startup
29456 mergetool: use path to mergetool in config var mergetool.<tool>.path
29457 mergetool: add support for ECMerge
29458 mergetool: avoid misleading message "Resetting to default..."
29459 Fix comment in strbuf.h to use correct name strbuf_avail()
29460 push: mention --verbose option in documentation
29461 push: teach push to pass --verbose option to transport layer
29462 push: support pushing HEAD to real branch name
29463 add refname_match()
29464 push: use same rules as git-rev-parse to resolve refspecs
29465 refactor fetch's ref matching to use refname_match()
29466 Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c
29467 sha1_file.c: Fix size_t related printf format warnings
29470 Add a message explaining that automatic GC is about to start
29471 builtin-fetch: Add "-q" as a synonym for "--quiet"
29472 git-svn: Don't create a "master" branch every time rebase is run
29475 Don't checkout the full tree if avoidable
29478 Make the list of common commands more exclusive
29479 Remove hint to use "git help -a"
29481 Thomas Harning (1):
29482 git-merge-ours: make it a builtin.
29484 Uwe Kleine-König (1):
29485 send-email: apply --suppress-from to S-o-b and cc-cmd
29488 git-svn: add a show-externals command.
29491 Added a test for fetching remote tags when there is not tags.
29493 Wincent Colaiuta (21):
29494 Further clarify clean.requireForce changes
29495 Authenticate only once in git-send-email
29496 Refactor patch_update_cmd
29497 Teach builtin-add to pass multiple paths to git-add--interactive
29498 Add path-limiting to git-add--interactive
29499 Add "--patch" option to git-add--interactive
29500 Fix typo in draft 1.5.4 release notes
29501 Highlight keyboard shortcuts in git-add--interactive
29502 revert/cherry-pick: Allow overriding the help text by the calling Porcelain
29503 add -i: allow prefix highlighting for "Add untracked" as well.
29504 git-add -i: add help text for list-and-choose UI
29505 Silence iconv warnings on Leopard
29506 Teach "git add -i" to colorize whitespace errors
29507 Allow --no-verify to bypass commit-msg hook
29508 Documentation: fix --no-verify documentation for "git commit"
29509 Add tests for pre-commit and commit-msg hooks
29510 Interactive editor tests for commit-msg hook
29511 Style fixes for pre-commit hook tests
29512 Use "whitespace" consistently
29513 Documentation: minor grammar fix for "git apply"
29514 Fix "diff --check" whitespace detection
29517 Initial Chinese translation for git-gui
29518 git-gui: Added initial version of po/glossary/zh_cn.po
29520 brian m. carlson (1):
29521 git-gui: Reorder msgfmt command-line arguments
29524 gitweb: use Perl built-in utf8 function for UTF-8 decoding.
29527 Version v1.5.3.8; changes since v1.5.3.7:
29528 -----------------------------------------
29531 Change from using email.com to example.com as example domain, as per RFC 2606.
29534 git-svn: support for funky branch and project names over HTTP(S)
29535 git-svn: clarify the "Ignoring error from SVN" piece
29538 t9600: test cvsimport from CVS working tree
29539 clone: correctly report http_fetch errors
29540 git-send-email: avoid duplicate message-ids
29543 config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
29545 Junio C Hamano (3):
29546 git grep shows the same hit repeatedly for unmerged paths
29547 git-am -i: report rewritten title
29550 Nguyễn Thái Ngọc Duy (3):
29551 Add missing inside_work_tree setting in setup_git_directory_gently
29552 Do check_repository_format() early
29553 Do check_repository_format() early (re-fix)
29556 Version v1.5.3.7; changes since v1.5.3.6:
29557 -----------------------------------------
29559 Björn Steinbrink (3):
29560 git-commit.sh: Fix usage checks regarding paths given when they do not make sense
29561 t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
29562 git-commit: Add tests for invalid usage of -a/--interactive with paths
29565 config: correct core.loosecompression documentation
29566 config: clarify compression defaults
29568 J. Bruce Fields (7):
29569 git-remote.txt: fix example url
29570 user-manual: mention "..." in "Generating diffs", etc.
29571 Documentation: Fix references to deprecated commands
29572 user-manual: define "branch" and "working tree" at start
29573 user-manual: failed push to public repository
29574 user-manual: clarify language about "modifying" old commits
29575 user-manual: recovering from corruption
29578 Improve description of git-branch -d and -D in man page.
29581 send-email: add transfer encoding header with content-type
29582 Add basic cvsimport tests
29583 cvsimport: use rev-parse to support packed refs
29584 cvsimport: miscellaneous packed-ref fixes
29585 cvsimport: fix usage of cvsimport.module
29587 Johannes Schindelin (2):
29588 bundle create: keep symbolic refs' names instead of resolving them
29589 Replace the word 'update-cache' by 'update-index' everywhere
29592 t7003-filter-branch: Fix test of a failing --msg-filter.
29594 Junio C Hamano (11):
29595 format-patch -s: add MIME encoding header if signer's name requires so
29596 test format-patch -s: make sure MIME content type is shown as needed
29597 ce_match_stat, run_diff_files: use symbolic constants for readability
29598 git-add: make the entry stat-clean after re-adding the same contents
29599 t2200: test more cases of "add -u"
29600 Make test scripts executable.
29601 Fix sample pre-commit hook
29602 git-checkout: describe detached head correctly
29603 scripts: do not get confused with HEAD in work tree
29604 Fix typo in t4008 test title
29607 Linus Torvalds (1):
29608 Fix rev-list when showing objects involving submodules
29611 Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.
29614 Make GIT_INDEX_FILE apply to git-commit
29616 Steffen Prohaska (1):
29617 user-manual: Add section "Why bisecting merge commits can be harder ..."
29620 Version v1.5.3.6; changes since v1.5.3.5:
29621 -----------------------------------------
29624 stop t1400 hiding errors in tests
29626 Ask Bjørn Hansen (1):
29627 When exec() fails include the failing command in the error message
29629 Benoit Sigoure (2):
29630 git-send-email: Change the prompt for the subject of the initial message.
29631 git-svn: prevent dcommitting if the index is dirty.
29634 cvsexportcommit: fix for commits that do not have parents
29636 Christian Couder (1):
29637 for-each-ref: fix off by one read.
29639 David D. Kilzer (2):
29640 RelNotes-1.5.3.5: fix typo
29641 RelNotes-1.5.3.5: fix another typo
29644 Improve accuracy of check for presence of deflateBound.
29647 git-svn: fix dcommit clobbering when committing a series of diffs
29648 git-svn: t9114: verify merge commit message in test
29651 git-diff.txt: add section "output format" describing the diff formats
29652 git-cvsimport: really convert underscores in branch names to dots with -u
29653 git-daemon: fix remote port number in log entry
29654 git-mailsplit: with maildirs not only process cur/, but also new/
29656 Jakub Narębski (1):
29657 gitweb: Update config file example for snapshot feature in gitweb/INSTALL
29660 git-branch: remove mention of non-existent '-b' option
29661 git-send-email: add charset header if we add encoded 'From'
29664 replace reference to git-rm with git-reset in git-commit doc
29666 Johannes Schindelin (1):
29667 Add Documentation/CodingGuidelines
29670 Remove escaping of '|' in manpage option sections
29671 instaweb: Minor cleanups and fixes for potential problems
29672 Documentation: Fix man page breakage with DocBook XSL v1.72
29674 Jonathan del Strother (1):
29675 Fixing path quoting in git-rebase
29677 Junio C Hamano (12):
29678 grep with unmerged index
29679 refresh_index_quietly(): express "optional" nature of index writing better
29680 Makefile: add missing dependency on wt-status.h
29681 Start preparing for 1.5.3.6
29682 t/t3404: fix test for a bogus todo file.
29683 revert/cherry-pick: allow starting from dirty work tree.
29684 git-clean: honor core.excludesfile
29685 core.excludesfile clean-up
29686 Fix per-directory exclude handing for "git add"
29687 Update draft release notes for 1.5.3.6
29688 grep -An -Bm: fix invocation of external grep command
29691 Kristian Høgsberg (1):
29692 Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
29694 Marco Costalba (1):
29695 Remove a couple of duplicated include
29698 Delay pager setup in git blame
29701 print warning/error/fatal messages in one shot
29702 git-hash-object should honor config variables
29703 fix index-pack with packs >4GB containing deltas on 32-bit machines
29705 Ralf Wildenhues (3):
29706 git-clone.txt: Improve --depth description.
29707 Avoid a few unportable, needlessly nested "...`...".
29708 Fix sed string regex escaping in module_name.
29710 Sergei Organov (6):
29711 git-filter-branch.txt: fix a typo.
29712 git-format-patch.txt: fix explanation of an example.
29713 Documentation: quote commit messages consistently.
29714 SubmittingPatches: improve the 'Patch:' section of the checklist
29715 core-tutorial.txt: Fix argument mistake in an example.
29716 git-remote.txt: fix typo
29718 Shawn O. Pearce (2):
29719 Fix memory leak in traverse_commit_list
29720 Don't allow fast-import tree delta chains to exceed maximum depth
29722 Vincent Zanotti (1):
29723 gitweb: correct month in date display for atom feeds
29725 Wincent Colaiuta (2):
29726 Grammar fixes for gitattributes documentation
29727 Fix t9101 test failure caused by Subversion "auto-props"
29730 Version v1.5.3.5; changes since v1.5.3.4:
29731 -----------------------------------------
29734 Ensure we add directories in the correct order
29737 Fix generation of perl/perl.mak
29739 Andrew Clausen (1):
29740 helpful error message when send-pack finds no refs in common.
29742 Aurelien Bompard (1):
29743 honor the http.sslVerify option in shell scripts
29745 Benoit Sigoure (1):
29746 Fix a small memory leak in builtin-add
29748 Björn Steinbrink (3):
29749 Fix --strategy parsing in git-rebase--interactive.sh
29750 git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
29751 git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
29753 Brian Gernhardt (1):
29754 cvsserver: Use exit 1 instead of die when req_Root fails.
29756 Frank Lichtenheld (1):
29757 git-config: don't silently ignore options after --list
29760 git-config: handle --file option with relative pathname properly
29761 git-config: print error message if the config file cannot be read
29763 Jean-Luc Herren (2):
29764 git add -i: Fix parsing of abbreviated hunk headers
29765 git add -i: Remove unused variables
29768 send-pack: respect '+' on wildcard refspecs
29770 Joakim Tjernlund (1):
29771 Improve receive-pack error message about funny ref creation
29773 Johannes Schindelin (5):
29774 clear_commit_marks(): avoid deep recursion
29775 rebase -i: use diff plumbing instead of porcelain
29776 Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
29777 fix filter-branch documentation
29778 filter-branch: update current branch when rewritten
29780 Julian Phillips (1):
29781 fast-import: Fix argument order to die in file_change_m
29783 Junio C Hamano (8):
29784 git-remote: fix "Use of uninitialized value in string ne"
29785 sha1_file.c: avoid gcc signed overflow warnings
29786 merge-recursive.c: mrtree in merge() is not used before set
29787 RelNotes-1.5.3.5: describe recent fixes
29788 Prevent send-pack from segfaulting (backport from 'master')
29789 git-merge: document but discourage the historical syntax
29790 Update GIT 1.5.3.5 Release Notes
29794 Make merge-recursive honor diff.renamelimit
29796 Linus Torvalds (6):
29797 Fix embarrassing "git log --follow" bug
29798 Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
29799 git-blame shouldn't crash if run in an unmerged tree
29800 Avoid scary errors about tagged trees/blobs during git-fetch
29801 Fix directory scanner to correctly ignore files without d_type
29802 Fix diffcore-break total breakage
29804 Mathias Megyei (1):
29805 Do not remove distributed configure script
29807 Michael W. Olson (1):
29808 Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example
29810 Michele Ballabio (2):
29811 git-reflog: document --verbose
29812 git-archive: document --exec
29815 cherry-pick/revert: more compact user direction message
29817 Patrick Welche (1):
29818 Define NI_MAXSERV if not defined by operating system
29820 Ralf Wildenhues (1):
29821 gitk.txt: Fix markup.
29823 Robert Schiele (1):
29824 fixing output of non-fast-forward output of post-receive-email
29826 Sergei Organov (1):
29827 core-tutorial: Use new syntax for git-merge.
29829 Shawn O. Pearce (17):
29830 git-gui: Display message box when we cannot find git in $PATH
29831 git-gui: Handle starting on mapped shares under Cygwin
29832 git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
29833 git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
29834 git-gui: Don't crash when starting gitk from a browser session
29835 Whip post 1.5.3.4 maintenance series into shape.
29836 Correct typos in release notes for 1.5.3.5
29837 Avoid 'expr index' on Mac OS X as it isn't supported
29838 Document additional 1.5.3.5 fixes in release notes
29839 Yet more 1.5.3.5 fixes mentioned in release notes
29840 Avoid invoking diff drivers during git-stash
29841 Further 1.5.3.5 fixes described in release notes
29842 Paper bag fix diff invocation in 'git stash show'
29843 git-gui: Correctly report failures from git-write-tree
29844 git-gui: Handle progress bars from newer gits
29845 git-gui: Don't display CR within console windows
29846 Describe more 1.5.3.5 fixes in release notes
29849 git-gui: Avoid using bold text in entire gui for some fonts
29851 Steffen Prohaska (2):
29852 git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
29853 attr: fix segfault in gitattributes parsing code
29856 Version v1.5.3.4; changes since v1.5.3.3:
29857 -----------------------------------------
29860 post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used
29863 Add test case for ls-files --with-tree
29865 Federico Mena Quintero (4):
29866 Say when --track is useful in the git-checkout docs.
29867 Add documentation for --track and --no-track to the git-branch docs.
29868 Note that git-branch will not automatically checkout the new branch
29869 Make git-pull complain and give advice when there is nothing to merge with
29872 git-remote: exit with non-zero status after detecting errors.
29874 Jean-Luc Herren (2):
29875 git-add--interactive: Allow Ctrl-D to exit
29876 git-add--interactive: Improve behavior on bogus input
29879 diffcore-rename: cache file deltas
29882 Mention 'cpio' dependency in INSTALL
29884 Johannes Schindelin (2):
29885 rebase -i: squash should retain the authorship of the _first_ commit
29886 Fix typo in config.txt
29888 Junio C Hamano (5):
29889 Whip post 1.5.3.3 maintenance series into shape.
29890 git-commit: initialize TMP_INDEX just to be sure.
29891 for-each-ref: fix %(numparent) and %(parent)
29892 rename diff_free_filespec_data_large() to diff_free_filespec_blob()
29896 Must not modify the_index.cache as it may be passed to realloc at some point.
29899 git stash: document apply's --index switch
29901 Robert Schiele (1):
29902 the ar tool is called gar on some systems
29904 Steffen Prohaska (1):
29905 fixed link in documentation of diff-options
29908 Version v1.5.3.3; changes since v1.5.3.2:
29909 -----------------------------------------
29912 Move make_cache_entry() from merge-recursive.c into read-cache.c
29915 quiltimport: Skip non-existent patches
29918 Detect exec bit in more cases.
29921 Supplant the "while case ... break ;; esac" idiom
29924 git-svn: don't attempt to spawn pager if we don't want one
29927 Fixed minor typo in t/t9001-send-email.sh test command line.
29929 J. Bruce Fields (1):
29930 user-manual: don't assume refs are stored under .git/refs
29932 Jakub Narębski (2):
29933 gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
29934 gitweb: No difftree output for trivial merge
29937 unexpected Make output (e.g. from --debug) causes build failure
29938 Do not over-quote the -f envelopesender value.
29940 Johannes Schindelin (1):
29941 apply: get rid of --index-info in favor of --build-fake-ancestor
29944 gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
29945 gitattributes.txt: Be more to the point in the filter driver description.
29947 Junio C Hamano (3):
29948 Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
29949 Mergetool generating blank files (1.5.3)
29952 Linus Torvalds (1):
29953 Fix revision log diff setup, avoid unnecessary diff generation
29956 Move the paragraph specifying where the .idx and .pack files should be
29957 Conjugate "search" correctly in the git-prune-packed man page.
29960 user-manual: Explain what submodules are good for.
29963 User Manual: add a chapter for submodules
29964 git-bundle: fix commandline examples in the manpage
29967 core-tutorial: correct URL
29970 Fix spelling of overridden in documentation
29973 mergetool: fix emerge when running in a subdirectory
29974 mergetool: Fix typo in options passed to kdiff3
29977 Version v1.5.3.2; changes since v1.5.3.1:
29978 -----------------------------------------
29980 Alexandre Julliard (1):
29981 hooks--update: Explicitly check for all zeros for a deleted ref.
29983 Benoit Sigoure (1):
29984 Add test to check recent fix to "git add -u"
29987 git-tag -s must fail if gpg cannot sign the tag.
29990 git-send-email.perl: Add angle brackets to In-Reply-To if necessary
29992 Dmitry V. Levin (2):
29993 Makefile: Add cache-tree.h to the headers list
29994 git-commit: Disallow amend if it is going to produce an empty non-merge commit
29997 git-svn: fix "Malformed network data" with svn:// servers
29998 git-svn: understand grafts when doing dcommit
29999 Documentation/git-svn: updated design philosophy notes
30002 git-gui: lib/index.tcl: handle files with % in the filename properly
30003 git-clone: improve error message if curl program is missing or not executable
30005 J. Bruce Fields (13):
30006 user-manual: adjust section levels in "git internals"
30007 user-manual: move object format details to hacking-git chapter
30008 user-manual: rename "git internals" to "git concepts"
30009 user-manual: create new "low-level git operations" chapter
30010 user-manual: rewrite index discussion
30011 user-manual: reorder commit, blob, tree discussion
30012 user-manual: rewrite object database discussion
30013 user-manual: move packfile and dangling object discussion
30014 user-manual: fix introduction to packfiles
30015 user-manual: todo updates and cleanup
30016 documentation: replace Discussion section by link to user-manual chapter
30017 core-tutorial: minor cleanup
30018 git-apply: fix whitespace stripping
30021 Documentation/git-archive.txt: a couple of clarifications.
30023 Jean-Luc Herren (1):
30024 stash: end index commit log with a newline
30027 git-push: documentation and tests for pushing only branches
30029 Johannes Schindelin (2):
30030 revision walker: --cherry-pick is a limited operation
30031 apply --index-info: fall back to current index for mode changes
30033 Junio C Hamano (13):
30034 git-apply: do not read past the end of buffer
30035 git-add -u: do not barf on type changes
30036 git-format-patch --in-reply-to: accept <message@id> with angle brackets
30037 diff --no-index: do not forget to run diff_setup_done()
30038 Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
30039 Split grep arguments in a way that does not requires to add /dev/null.
30040 git-sh-setup: typofix in comments
30041 send-email: make message-id generation a bit more robust
30042 git-commit: Allow partial commit of file removal.
30043 git-commit: partial commit of paths only removed from the index
30044 Document ls-files --with-tree=<tree-ish>
30045 t/t4014: test "am -3" with mode-only change.
30048 Linus Torvalds (1):
30049 Fix the rename detection limit checking
30051 Matthias Urlichs (1):
30052 git-svnimport: Use separate arguments in the pipe for git-rev-parse
30055 (cvs|svn)import: Ask git-tag to overwrite old tags.
30057 Michele Ballabio (2):
30058 git-gui: show unstaged symlinks in diff viewer
30059 git-gui: handle "deleted symlink" diff marker
30062 Documentation / grammer nit
30065 fix doc for --compression argument to pack-objects
30067 Pierre Habouzit (1):
30068 Fix lapsus in builtin-apply.c
30070 Ramsay Allan Jones (1):
30071 Fix a test failure (t9500-*.sh) on cygwin
30073 Shawn O. Pearce (17):
30074 git-gui: Correct starting of git-remote to handle -w option
30075 git-gui: Fix detaching current branch during checkout
30076 git-gui: Properly set the state of "Stage/Unstage Hunk" action
30077 Don't allow contrib/workdir/git-new-workdir to trash existing dirs
30078 Cleanup unnecessary file modifications in t1400-update-ref
30079 Include a git-push example for creating a remote branch
30080 git-gui: Disable Tk send in all git-gui sessions
30081 git-gui: Avoid use of libdir in Makefile
30082 git-gui: Assume untracked directories are Git submodules
30083 git-gui: Trim trailing slashes from untracked submodule names
30084 Make --no-thin the default in git-push to save server resources
30085 git-gui: Don't delete send on Windows as it doesn't exist
30086 git-gui: Make backporting changes from i18n version easier
30087 git-gui: Font chooser to handle a large number of font families
30088 git-gui: Provide 'uninstall' Makefile target to undo an installation
30089 git-gui: Paper bag fix "Commit->Revert" format arguments
30090 git-gui: Disable native platform text selection in "lists"
30092 Sven Verdoolaege (1):
30093 git-diff: don't squelch the new SHA1 in submodule diffs
30095 Ulrik Sverdrup (1):
30096 Remove duplicate note about removing commits with git-filter-branch
30099 Fixed update-hook example allow-users format.
30102 Version v1.5.3.1; changes since v1.5.3:
30103 ---------------------------------------
30105 Junio C Hamano (2):
30106 Typofix: 1.5.3 release notes
30107 GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
30110 Version v1.5.3; changes since v1.5.3-rc7:
30111 -----------------------------------------
30114 Temporary fix for stack smashing in mailinfo
30117 git-tag: Fix -l option to use better shell style globs.
30120 git-svn: fix dcommit clobbering upstream when committing multiple changes
30122 Giuseppe Bilotta (2):
30123 git-filter-branch: more detailed USAGE
30124 git-filter-branch: document --original option
30127 git-send-email --cc-cmd
30129 Johannes Schindelin (5):
30130 completion: also complete git-log's --left-right and --cherry-pick option
30131 filter-branch: fix remnants of old syntax in documentation
30132 rebase -i: mention the option to split commits in the man page
30133 filter-branch: provide the convenience functions also for commit filters
30134 filter-branch: introduce convenience function "skip_commit"
30137 rebase -m: Fix incorrect short-logs of already applied commits.
30139 Junio C Hamano (13):
30140 git-daemon(1): assorted improvements.
30141 ls-files --error-unmatch: do not barf if the same pattern is given twice.
30142 Makefile: do not allow gnu make to remove test-*.o files
30143 filter-branch: make sure orig_namespace ends with a single slash.
30144 git-init: autodetect core.symlinks
30145 Make "git-log --" without paths behave the same as "git-log" without --
30146 Hopefully the final update to draft release notes for 1.5.3.
30147 git-svn: Protect against "diff.color = true".
30148 git-diff: resurrect the traditional empty "diff --git" behaviour
30149 Avoid one-or-more (\+) non BRE in sed scripts.
30150 Documentation: minor AsciiDoc mark-up fixes.
30151 Update my contact address as the maintainer.
30155 URL: allow port specification in ssh:// URLs
30158 Make git-archimport log entries more consistent
30161 fix same sized delta logic
30163 Paul Mackerras (1):
30164 gitk: Fix bug causing undefined variable error when cherry-picking
30166 Robin Rosenberg (1):
30167 Mention -m as an abbreviation for --merge
30169 Shawn O. Pearce (1):
30170 Teach bash about completing arguments for git-tag
30173 Fixing comment in merge strategies
30176 Version v1.5.3-rc7; changes since v1.5.3-rc6:
30177 ---------------------------------------------
30180 Fix git-remote for ActiveState Perl
30182 Alexandre Julliard (1):
30183 git.el: Avoid a lisp error when there's no current branch (detached HEAD).
30186 Documentation: For consistency, use CVS instead of cvs.
30187 Documentation: Correct various misspellings and typos.
30188 Make usage documentation for git-am consistent.
30189 Make usage documentation for git-add consistent.
30190 When nothing to git-commit, honor the git-status color setting.
30193 diff-delta.c: Fix broken skip calculation.
30194 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
30195 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
30196 git-svn.txt: fix an obvious misspelling.
30199 git.el: Added colors for dark background
30202 git-svn: update documentation with CAVEATS section
30203 git-svn: dcommit prints out the URL to be committed to
30205 J. Bruce Fields (5):
30206 user-manual: edit "ignoring files" for conciseness
30207 user-manual: minor editing for conciseness
30208 user-manual: introduce the word "commit" earlier
30209 user-manual: use pithier example commit
30210 user-manual: fix incorrect header level
30212 Jakub Narębski (1):
30213 gitweb: Fix escaping HTML of project owner in 'projects_list' and 'summary' views
30216 git-tag(1): Remove duplicate text
30218 Johannes Schindelin (2):
30219 rebase -i: fix squashing corner case
30220 name-rev: Fix non-shortest description
30222 Junio C Hamano (11):
30223 blame: check return value from read_sha1_file()
30224 pack-objects: check return value from read_sha1_file()
30225 RelNotes draft for 1.5.3 update.
30226 Fix initialization of a bare repository
30227 git --bare cmd: do not unconditionally nuke GIT_DIR
30228 git-merge: do up-to-date check also for all strategies
30229 Porcelain level "log" family should recurse when diffing.
30230 "format-patch --root rev" is the way to show everything.
30231 Documentation/git-diff: A..B and A...B cannot take tree-ishes
30232 format-patch documentation: reword to hint "--root <one-commit>" more clearly
30235 Linus Torvalds (1):
30236 Fix racy-git handling in git-write-tree.
30239 Describe two-dot and three-dot notation for diff endpoints.
30242 gitweb: Fix searchbox positioning
30243 gitweb: Lift any characters restriction on searched strings
30244 git-add: Make the "tried to add ignored file" error message less confusing
30245 git-add: Make the filename globbing note a bit clearer
30248 Fix breakage in git-rev-list.txt
30251 Documentation: update tar.umask default
30253 Sean Estabrooks (1):
30254 Reset terminal attributes when terminating git send-email
30256 Shawn O. Pearce (13):
30257 git-gui: Fix window manager problems on ion3
30258 git-gui: Allow git-merge to use branch names in conflict markers
30259 git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
30260 git-gui: Fix "unoptimized loading" to not cause git-gui to crash
30261 Fix new-workdir (again) to work on bare repositories
30262 Suggest unsetting core.bare when using new-workdir on a bare repository
30263 Update bash completion with new 1.5.3 command line options
30264 Teach bash to complete ref arguments to git-describe
30265 Teach bash about git-submodule and its subcommands
30266 git-gui: Refactor diff pane popup support for future improvements
30267 git-gui: Do not offer to stage three-way diff hunks into the index
30268 git-gui: Correct 'git gui blame' in a subdirectory
30269 Don't segfault if we failed to inflate a packed delta
30271 Simon Hausmann (2):
30272 git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository.
30273 git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.
30275 Stefan Sperling (1):
30276 Document -u option in git-svnimport man page
30278 martin f. krafft (2):
30279 git-svn init/clone --stdlayout option to default-init trunk/tags/branches
30280 Install man3 manpages to $PREFIX/share/man/man3 even for site installs
30283 Version v1.5.3-rc6; changes since v1.5.3-rc5:
30284 ---------------------------------------------
30287 Fix whitespace in "Format of STDIN stream" of fast-import
30288 Avoid using va_copy in fast-import: it seems to be unportable.
30290 Arjen Laarhoven (2):
30291 gitk: Make the date/time display configurable
30292 t1301-shared-repo.sh: fix 'stat' portability issue
30295 Clarify actual behavior of 'git add' and ignored files
30297 Brian Gernhardt (1):
30298 Minor clarifications to git-filter-branch usage and doc
30301 Fix misspelling of 'suppress' in docs
30304 git-svn: fix log with single revision against a non-HEAD branch
30307 gitk: Handle 'copy from' and 'copy to' in diff headers.
30309 Junio C Hamano (10):
30310 Fix "git add -u" data corruption.
30312 Fix read-tree merging more than 3 trees using 3-way merge
30313 Update documentation links for older releases.
30314 git-clone: allow --bare clone
30315 Documentation/git-rebase: fix an example
30316 Clean-up read-tree error condition.
30317 fast-import pull request
30318 git clone: do not issue warning while cloning locally across filesystems
30322 git-submodule: re-enable 'status' as the default subcommand
30324 Linus Torvalds (2):
30325 Make thin-pack generation subproject aware.
30326 Take binary diffs into account for "git rebase"
30328 Lukas Sandström (1):
30329 Add the word reflog to Documentation/config.txt:core.logAllRefUpdates
30332 git-completion.bash - add support for git-bundle
30335 Add and document a global --no-pager option for git.
30338 Clarify commit-tree documentation
30341 pack-objects: remove bogus arguments to delta_cacheable()
30343 Paul Mackerras (3):
30344 gitk: Fix warning when removing a branch
30345 gitk: Fix bug in fix for warning when removing a branch
30346 gitk: Add a window to list branches, tags and other references
30349 path-list.c: always free strdup'ed paths
30351 Salikh Zakirov (1):
30352 git-add -u paths... now works from subdirectory
30354 Sean Estabrooks (1):
30355 Fix small typo in git send-email man page.
30357 Shawn O. Pearce (11):
30358 git-gui: Avoid Tcl error in popup menu on diff viewer
30359 Actually allow TAG_FIXUP branches in fast-import
30360 Use handy ALLOC_GROW macro in fast-import when possible
30361 Teach fast-import to ignore lines starting with '#'
30362 Make trailing LF following fast-import `data` commands optional
30363 Make trailing LF optional for all fast-import commands
30364 Allow frontends to bidirectionally communicate with fast-import
30365 Generate crash reports on die in fast-import
30366 Include recent command history in fast-import crash reports
30367 Correct documentation of 'reflog show' to explain it shows HEAD
30368 Don't allow combination of -g and --reverse as it doesn't work
30370 Steffen Prohaska (1):
30371 gitk: Let user easily specify lines of context in diff view
30374 Document what the stage numbers in the :$n:path syntax mean.
30376 Sven Verdoolaege (1):
30377 git-apply: apply submodule changes
30380 git-gui: Added support for OS X right click
30383 Version v1.5.3-rc5; changes since v1.5.3-rc4:
30384 ---------------------------------------------
30387 Documentation/git-svn: how to clone a git-svn-created repository
30389 Alberto Bertogli (1):
30390 Allow git-svnimport to take "" as the trunk directory.
30393 Fix filehandle leak in "git branch -D"
30394 gitk: Continue and show error message in new repos
30395 gitk: Show an error and exit if no .git could be found
30397 Alexandre Julliard (3):
30398 git.el: Add support for interactive diffs.
30399 git.el: Always set the current directory in the git-diff buffer.
30400 git-add: Add support for --refresh option.
30403 cvsserver: Fix for work trees
30404 Add read_cache to builtin-check-attr
30406 Brian Gernhardt (1):
30407 Fix t5701-clone-local for white space from wc
30410 Make git tag a builtin.
30411 builtin-tag.c: Fix two memory leaks and minor notation changes.
30412 Make verify-tag a builtin.
30415 Documentation/git-commit.txt: correct bad list formatting.
30416 Add support for an info version of the user manual
30417 INSTALL: explain info installation and dependencies.
30418 Documentation/Makefile: remove cmd-list.made before redirecting to it.
30419 git-sh-setup.sh: make GIT_DIR absolute
30420 Add a test for git-commit being confused by relative GIT_DIR
30423 git-am: initialize variable $resume on startup
30425 J. Bruce Fields (4):
30426 user-manual: update for new default --track behavior
30427 user-manual: mention git-gui
30428 documentation: use the word "index" in the git-add manual page
30429 documentation: use the word "index" in the git-commit man page
30431 Jakub Narębski (1):
30432 gitweb: Fix handling of $file_name in feed generation
30434 Johannes Schindelin (4):
30435 launch_editor(): Heed GIT_EDITOR and core.editor settings
30436 Teach "git stripspace" the --strip-comments option
30437 checkout-index needs a working tree
30438 Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset
30440 Junio C Hamano (24):
30441 git-clone: aggressively optimize local clone behaviour.
30442 git-completion: add "git stash"
30443 INSTALL: add warning on docbook-xsl 1.72 and 1.73
30444 unpack-trees.c: assume submodules are clean during check-out
30445 Fix install-doc-quick target
30446 user-manual: mention git stash
30447 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
30448 pager: find out pager setting from configuration
30449 Fix "make GZ=1 quick-install-doc"
30450 Reorder the list of commands in the manual.
30451 Fix formatting of git-blame documentation.
30452 Fix an illustration in git-rev-parse.txt
30453 tweak manpage formatting
30454 Revert "tweak manpage formatting"
30455 Optimize "diff --cached" performance.
30456 allow git-bundle to create bottomless bundle
30457 allow git-bundle to create bottomless bundle
30458 t3404: fix "fake-editor"
30459 builtin-bundle create - use lock_file
30460 git-diff: squelch "empty" diffs
30461 merge-recursive: do not rudely die on binary merge
30462 attr.c: refactoring
30463 attr.c: read .gitattributes from index as well.
30466 Jyotirmoy Bhattacharya (1):
30467 Fixed git-push manpage
30469 Linus Torvalds (8):
30470 connect: accept file:// URL scheme
30471 apply: remove directory that becomes empty by renaming the last file away
30472 Start moving unpack-trees to "struct tree_desc"
30473 Fix "git commit directory/" performance anomaly
30474 Move old index entry removal from "unpack_trees()" into the individual functions
30475 Optimize the common cases of git-read-tree
30476 Optimize the two-way merge of git-read-tree too
30477 Optimize the three-way merge of git-read-tree
30479 Luiz Fernando N. Capitulino (3):
30480 Avoid ambiguous error message if pack.idx header is wrong
30481 Introduces xmkstemp()
30482 Use xmkstemp() instead of mkstemp()
30484 Marco Costalba (1):
30485 Add --log-size to git log to print message size
30488 builtin-bundle.c - use stream buffered input for rev-list
30489 builtin-bundle - use buffered reads for bundle header
30490 gitk: Enable selected patch text on Windows
30491 gitk: Handle MouseWheel events on Windows
30492 t3902 - skip test if file system doesn't support HT in names
30494 Paul Mackerras (4):
30495 gitk: Add a context menu for file list entries
30496 gitk: Fix bug causing the "can't unset idinlist(...)" error
30497 gitk: Fix bug introduced in commit 67a4f1a7
30498 gitk: Fix bug causing Tcl error when updating graph
30500 Randal L. Schwartz (1):
30501 add "test-absolute-path" to .gitignore
30504 git-p4: Fix the sorting of changelists when cloning a Perforce repository.
30507 diff: don't run pager if user asked for a diff style exit code
30508 diff: squelch empty diffs even more
30510 Shawn O. Pearce (4):
30511 Document GIT_SSH environment variable alongside other variables
30512 Teach update-paranoid how to store ACLs organized by groups
30513 Teach the update-paranoid to look at file differences
30514 Use the empty tree for base diff in paranoid-update on new branches
30516 Simon Hausmann (2):
30517 git-p4: Fix support for symlinks.
30518 git-p4: Fix git-p4 submit to include only changed files in the perforce submit template.
30520 Steffen Prohaska (1):
30521 Improved hint on how to set identity
30524 git-stash documentation: stash numbering starts at zero, not one
30525 git-stash documentation: add missing backtick
30528 Add a note about the index being updated by git-status in some cases
30530 Uwe Kleine-König (3):
30531 send-email: teach sanitize_address to do rfc2047 quoting
30532 send-email: rfc822 forbids using <address@domain> without a non-empty "phrase"
30533 send-email: get all the quoting of realnames right
30536 Version v1.5.3-rc4; changes since v1.5.3-rc3:
30537 ---------------------------------------------
30540 Add an option to specify a file to config builtin
30541 Add a test for git-config --file
30542 Make verse of git-config manpage more readable
30543 Hack git-add--interactive to make it work with ActiveState Perl
30545 Alexandre Julliard (2):
30546 git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.
30547 git.el: Take into account the core.excludesfile config option.
30549 Bradford C. Smith (2):
30550 fully resolve symlinks when creating lockfiles
30551 use lockfile.c routines in git_commit_set_multivar()
30553 Brian Gernhardt (1):
30554 Document commit.template configuration variable.
30556 Christian Couder (1):
30557 rev-list --bisect: fix allocation of "int*" instead of "int".
30559 Christian Stimming (1):
30560 git-gui: Unify wording to say "to stage" instead of "to add"
30563 Makefile: use $(FIND) instead of find
30564 git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept commands
30565 When generating manpages, delete outdated targets first.
30567 David Soria Parra (1):
30568 Documentation/gitattributes.txt: typofix
30571 Fix documentation for core.gitproxy to reflect code
30573 Han-Wen Nienhuys (2):
30574 Sort output of "p4 change" in incremental import before further
30575 Fix style nit in Python slicing.
30577 Jakub Narębski (3):
30578 gitweb: Show submodule entries in the 'tree' view
30579 gitweb: Simplify 'opt' parameter validation, add "no merges" feeds
30580 gitweb: Allow for multivalued parameters passed to href subroutine
30583 Documentation/git-diff: remove -r from --name-status example
30584 git-diff: turn on recursion by default
30587 --base-path-relaxed option
30589 Johannes Schindelin (11):
30590 rebase -i: fix overzealous output redirection
30591 rebase -i: fix interrupted squashing
30592 white space fixes in setup.c
30593 Add is_absolute_path() and make_absolute_path()
30594 Add functions get_relative_cwd() and is_inside_dir()
30595 Add set_git_dir() function
30596 Clean up work-tree handling
30597 get_relative_cwd(): clarify why it handles dir == NULL
30598 rebase -i: ignore patches that are already in the upstream
30599 rebase -i: fix for optional [branch] parameter
30600 read-tree: remove unnecessary call to setup_git_directory()
30602 Julian Phillips (1):
30603 git-gui: Handle git versions of the form n.n.n.GIT
30605 Junio C Hamano (23):
30606 Make sure git-stash works from subdirectory.
30607 gitweb: fix broken snapshot
30608 git-submodule module_name: avoid using unwieldy "value_regexp" feature.
30609 git-submodule: remove redundant call to git-describe
30610 When locking in a symlinked repository, try to lock the original.
30611 git_mkstemp(): be careful not to overflow the path buffer.
30612 Update description of -z option.
30613 git-stash: do not remove a ref by hand.
30614 Add test for symlinked configuration file updates.
30615 Fix git-stash apply --index
30616 git-stash apply --index: optimize postprocessing
30617 log_ref_write() -- do not chomp reflog message at the first LF
30618 symbolic-ref, update-ref: do not refuse reflog message with LF
30619 rebase: try not to munge commit log message
30620 add_file_to_index: skip rehashing if the cached stat already matches
30621 Unset GIT_EDITOR while running tests.
30622 git.c: execution path
30623 git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
30624 RelNotes 1.5.3 updates before -rc4
30625 Fix work-tree related breakages
30626 gitweb: do not choke on recursive symlink
30627 Fix bogus use of printf in t3700 test
30630 Kristian Høgsberg (1):
30631 Add test case for basic commit functionality.
30634 gitk: Ignore ctrl-z as EOF on windows
30636 Nanako Shiraishi (1):
30637 git-stash: Make sure reflog is created for refs/stash
30639 Nguyễn Thái Ngọc Duy (1):
30640 git-write-tree should not crash if prefix does not exist
30642 Paul Mackerras (4):
30643 gitk: Show changes in index and changes in working directory separately
30644 gitk: Make the fake commit for the index changes green rather than magenta
30645 gitk: Wait for the window to become visible after creating it
30646 gitk: Fix bugs in the Find function
30649 git-svn: Translate invalid characters in refname
30651 Robert Schiele (2):
30652 add option to find zlib in custom path
30653 make the name of the library directory a config option
30655 Robin Rosenberg (1):
30656 Document --unified/-U option
30659 Rename git-rebase interactive buffer: todo => git-rebase-todo
30661 Shawn O. Pearce (49):
30662 git-gui: Skip -dirty suffix on core git versions
30663 git-gui: Brown paper bag "dirty git version fix"
30664 git-gui: Always disable the Tcl EOF character when reading
30665 git-gui: Delay searching for 'nice' until its really asked for
30666 git-gui: Don't crash in ask_popup if we haven't mapped main window yet
30667 git-gui: Change our initial GC hint to be an estimate
30668 git-gui: Let the user continue even if we cannot understand git version
30669 git-gui: Delay the GC hint until after we are running
30670 git-gui: Move feature option selection before GIT_DIR init
30671 git-gui: Allow blame/browser subcommands on bare repositories
30672 git-gui: Allow browser subcommand to start in subdirectory
30673 git-gui: Allow users to browse any branch, not just the current one
30674 git-gui: Clarify the visualize history menu options
30675 git-gui: Increase the default height of the revision picker
30676 git-gui: Convert merge dialog to use class system
30677 Don't offer my special Tools/Migrate hack unless in multicommit
30678 git-gui: Bind Ctrl/Cmd-M to merge action
30679 git-gui: Avoid unnecessary global statements when possible
30680 git-gui: Translate standard encoding names to Tcl ones
30681 git-gui: Don't show blame tooltips that we have no data for
30682 git-gui: Completely remove support for creating octopus merges
30683 git-gui: Automatically backup the user's commit buffer
30684 git-gui: Save the merge base during checkout_op processing
30685 git-gui: Factor out common fast-forward merge case
30686 git-gui: Simplify error case for unsupported merge types
30687 git-gui: Skip unnecessary read-tree work during checkout
30688 git-gui: Internally allow fetch without storing for future pull support
30689 git-gui: Completely remove my Tools/Migrate hack
30690 git-gui: Fix unnecessary fast-forward during checkout
30691 gitk: Bind keyboard actions to the command key on Mac OS
30692 git-gui: Clarify meaning of add tracked menu option
30693 git-gui: Paper bag fix quitting crash after commit
30694 git-gui: Refactor diff popup into a procedure to ease i18n work
30695 git-gui: Refactor current branch menu items to make i18n easier
30696 git-gui: Avoid unnecessary symbolic-ref call during checkout
30697 git-gui: Save remote urls obtained from config/remotes setup
30698 git-gui: Display commit/tag/remote info in tooltip of revision picker
30699 git-gui: Show ref last update times in revision chooser tooltips
30700 git-gui: Replace merge dialog with our revision picker widget
30701 git-gui: Cleanup bindings within merge dialog
30702 git-gui: Format tracking branch merges as though they were pulls
30703 git-gui: Remove usernames from absolute SSH urls during merging
30704 git-gui: Don't kill modified commit message buffer with merge templates
30705 git-gui: Honor core.excludesfile when listing extra files
30706 git-gui: Use progress bar while resetting/aborting files
30707 git-gui: Make sure remotes are loaded when picking revisions
30708 git-gui: Don't offer to stage hunks from untracked files
30709 git-gui: Use more modern looking icons in the tree browser
30710 git-gui: Minor refactoring of merge command line in merge support
30712 Simon Hausmann (1):
30713 git-p4: Fix p4 user cache population on Windows.
30716 Try to be consistent with capitalization in the documentation
30718 Thomas Schwinge (2):
30719 Don't rely on unspecified behavior
30720 Support building on GNU/Hurd
30723 Version v1.5.3-rc3; changes since v1.5.3-rc2:
30724 ---------------------------------------------
30727 Add GIT_EDITOR environment and core.editor configuration variables
30729 Alexandre Julliard (2):
30730 git.el: Support for incremental status updates.
30731 git.el: Pass an explicit argument to enable smerge-mode.
30734 Rename read_pipe() with read_fd() and make its buffer nul-terminated.
30737 contrib/emacs/Makefile: Also install .el files.
30738 Documentation/gitignore.txt: Fix the seriously misleading priority explanation
30741 git-svn: fix commiting renames over DAV with funky file names
30743 Francis Moreau (1):
30744 Fix git-branch documentation when using remote refs
30746 Jakub Narębski (3):
30747 gitweb cleanup: Move @diff_opts declaration earlier
30748 gitweb: Fix support for legacy gitweb config for snapshots
30749 gitweb: More detailed error messages for snapshot format
30752 pretty-options.txt: tiny doc fix
30754 Johannes Schindelin (11):
30755 filter-branch: get rid of "set -e"
30756 rebase -i: call editor just once for a multi-squash
30757 fsck --lost-found: write blob's contents, not their SHA-1
30758 mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'
30759 Shut "git rebase -i" up when no --verbose was given
30760 rebase -i: exchange all "if [ .. ]" by "if test .."
30761 filter-branch: Big syntax change; support rewriting multiple refs
30762 Teach revision machinery about --no-walk
30763 git log -g: Complain, but do not fail, when no reflogs are there
30764 Teach approxidate() to understand "never"
30765 git am: skip pine's internal folder data
30767 Julian Phillips (1):
30768 Force listingblocks to be monospaced in manpages
30770 Junio C Hamano (8):
30772 Do not expect unlink(2) to fail on a directory.
30773 Fix VISUAL/EDITOR preference order in Documentation/config.txt.
30774 Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
30775 Mark user-manual as UTF-8
30776 user-manual: fix typolets.
30777 t9200: Be careful when checking CVS/Entries
30781 send-email: Update regex parsing for pine aliases
30783 Linus Torvalds (2):
30784 Do a better job at guessing unknown character sets
30785 Fix up duplicate parents removal
30787 Marco Costalba (1):
30788 Avoid to duplicate commit message when is not encoded
30790 Matt McCutchen (1):
30791 gitweb: snapshot cleanups & support for offering multiple formats
30793 Nanako Shiraishi (1):
30794 Document "git stash message..."
30797 filter-branch: fix dash complaining about "Missing '))'"
30798 cleanup unpack-trees.c: shrink struct tree_entry_list
30801 git-svn: Minimalistic patch which allows svn usernames with space(s).
30803 Robin Rosenberg (1):
30804 cvsexportcommit: avoid racy CVS problem.
30807 git-p4: use subprocess in p4CmdList
30808 git-p4: input to "p4 files" by stdin instead of arguments
30810 Simon Hausmann (3):
30811 git-p4: Cleanup, make listExistingP4Branches a global function for later use.
30812 git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
30813 git-p4: Cleanup, used common function for listing imported p4 branches
30816 Document how to tell git to not launch a pager
30817 Teach git-commit about commit message templates.
30819 Sven Verdoolaege (1):
30820 unpack-trees.c: assume submodules are clean during check-out
30823 Version v1.5.3-rc2; changes since v1.5.3-rc1:
30824 ---------------------------------------------
30827 Fix git-rebase -i to allow squashing of fast-forwardable commits
30830 Use $(RM) in Makefiles instead of 'rm -f'
30833 git-svn: remove leading slashes from fetch lines in the generate config
30836 make git-send-email.perl handle email addresses with no names when Email::Valid is present
30838 Jakub Narębski (3):
30839 Update git-merge documentation.
30840 Document long options '--message=<msg>' and '--no-commit'
30841 Document git commit --untracked-files and --verbose
30844 git-cvsserver: detect/diagnose write failure, etc.
30847 Remove useless uses of cat, and replace with filename arguments
30849 Junio C Hamano (7):
30850 Make show_rfc2822_date() just another date output format.
30851 Wire new date formats to --date=<format> parser.
30852 Document new --date=<format>
30853 Add contrib/stats/mailmap.pl script
30855 Documentation/git-commit-tree: remove description of a nonexistent limitation
30858 Marius Storm-Olsen (1):
30859 Fix git-p4 on Windows to not use the Posix sysconf function.
30862 More permissive "git-rm --cached" behavior without -f.
30865 Pack-objects: properly initialize the depth value
30867 Paul Mackerras (1):
30868 gitk: Fix bug introduced by previous commit
30870 Peter Hagervall (1):
30871 Make every builtin-*.c file #include "builtin.h"
30873 Robin Rosenberg (1):
30874 Support output ISO 8601 format dates
30876 Sean Estabrooks (3):
30877 Remove "WITH_P4IMPORT" knob from the Makefile
30878 Remove p4 rpm from git.spec.in.
30879 Demote git-p4import to contrib status.
30881 Shawn O. Pearce (2):
30882 Correct trivial typo in fast-import documentation
30883 Teach fast-import to recursively copy files/directories
30885 Stephen Rothwell (1):
30886 send-email: discard blank around address in extract_valid_address as well.
30888 Sven Verdoolaege (1):
30889 lockfile.c: schedule remove_lock_file only once.
30892 Version v1.5.3-rc1; changes since v1.5.3-rc0:
30893 ---------------------------------------------
30896 fix remote.origin.url in tutorial.txt
30899 Handle missing prefix for "Subject:" as if no prefix given
30900 Handle format.subjectprefix for every command which accepts --pretty
30901 Fix t5516 to create test repo without hooks
30902 Add -v|--verbose to git remote to show remote url
30905 Remove USE_PAGER from git-pickaxe and git-annotate
30906 Add urls.txt to git-clone man page
30909 user-manual: grammar and style fixes
30911 Brian Downing (10):
30912 pack-objects: Prefer shallower deltas if the size is equal
30913 gitk: Fix for tree view ending in nested directories
30914 Pack information tool
30915 Correct shebang line for contrib/stats/packinfo.pl
30916 Don't try to delta if target is much smaller than source
30917 Support fetching the memory usage of a delta index
30918 Add functions for parsing integers with size suffixes
30919 Add pack-objects window memory usage limit
30920 Add --window-memory option to git-repack
30921 Add documentation for --window-memory, pack.windowMemory
30923 Brian Gernhardt (1):
30924 Add core.pager config variable.
30926 CJ van den Berg (1):
30927 git-submodule: Fix two instances of the same typo
30930 t7004: Skip tests for signed tags in an old version of gpg.
30931 t0030: Remove repeated instructions and add missing &&
30932 t0030: Add tests with consecutive text lines and others with spaces added.
30933 t7004: Add tests for the git tag -n option.
30934 Function stripspace now gets a buffer instead file descriptors.
30936 Daniel Barkalow (2):
30937 Add allocation and freeing functions for struct refs
30938 Some cosmetic changes to remote library
30941 Add missing functions to contrib/emacs/vc-git.el
30944 git-svn: fix blocking with svn:// servers after do_switch
30946 Frank Lichtenheld (1):
30947 cvsserver: always initialize state in argsplit()
30950 git-gui: properly popup error if gitk should be started but is not installed
30951 git-commit: don't add multiple Signed-off-by: from the same identity
30953 J. Bruce Fields (2):
30955 user-manual: more explanation of push and pull usage
30958 stash: allow running from a subdirectory
30961 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
30963 Johannes Schindelin (24):
30964 diff --no-index: fix --name-status with added files
30965 glossary: add 'reflog'
30966 Document git-filter-branch
30967 Add diff-option --ext-diff
30968 filter-branch: add a test for the commit removal example
30969 filter-branch: make output nicer
30970 filter-branch: a few more touch ups to the man page
30971 filter-branch documentation: clarify which filters are eval'ed
30972 filter-branch: fail gracefully when a filter fails
30973 Future-proof source for changes in xdemitconf_t
30974 Teach git-stash to "apply --index"
30975 Enable "git rerere" by the config variable rerere.enabled
30976 git-branch: default to --track
30977 Fix "apply --reverse" with regard to whitespace
30978 branch.autosetupmerge: allow boolean values, or "all"
30979 rebase -i: handle --continue more like non-interactive rebase
30980 rebase -i: actually show the diffstat when being verbose
30981 rebase -i: remember the settings of -v, -s and -p when interrupted
30982 rebase -i: put a nice warning into the todo list
30983 rerere: record resolution even if file is not in merge base
30984 Fix core.sharedRepository = 2
30985 Fix --cherry-pick with given paths
30986 Add for_each_remote() function, and extend remote_find_tracking()
30987 branch --track: code cleanup and saner handling of local branches
30990 filter-branch: Avoid an error message in the map function.
30991 filter-branch documentation: some more touch-ups.
30992 Allow rebase to run if upstream is completely merged
30995 fsck --lost-found writes to subdirectories in .git/lost-found/
30997 Junio C Hamano (22):
30998 Update draft Release Notes for 1.5.3
30999 Update reflog message created for stashes
31000 Do not check if getcwd() result begins with a slash.
31001 Fix git-stash(1) markup.
31002 git-stash: allow more descriptive reminder message when saving
31003 Introduce diff_filespec_is_binary()
31004 Per-path attribute based hunk header selection.
31005 Fix configuration syntax to specify customized hunk header patterns.
31006 diff: honor binariness specified in attributes
31007 gitweb: make repeated calls to git_get_project_owner() bearable
31008 diff.c: make built-in hunk header pattern a separate table
31009 git-gui: use "blame -w -C -C" for "where did it come from, originally?"
31010 git-stash: try reusing cached stat info as much as possible
31011 Fix merge-one-file for our-side-added/our-side-removed cases
31012 Document custom hunk header selection
31013 revision.c: remove duplicated parents after history simplification
31014 Revert 88494423 (removal of duplicate parents in the output codepath)
31015 Re-code builtin-branch.c in UTF-8
31016 Teach read-tree 2-way merge to ignore intermediate symlinks
31018 Update list of older git docs
31022 git-submodule(1): update description and key names
31024 Marcus Fritzsch (1):
31025 Fixed a formulation mistake in Documentation/user-manual.txt
31028 Prefer EMAIL to username@hostname.
31029 Change "added.moved or removed" to "added, moved or removed" in
31030 Add [verse] to the SYNOPSIS section of git-submodule.txt.
31032 Matt McCutchen (3):
31033 gitweb: make search form generate pathinfo-style URLs
31034 gitweb: make "No commits" in project list gray, not bold green
31035 Makefile: rebuild git.o on version change, clean up git$X flags
31037 Matthias Lederhofer (3):
31038 git-init: set core.worktree if GIT_WORK_TREE is specified
31039 git-clone: split up long &&-command-chain and use a function for cleanup
31040 make git-clone GIT_WORK_TREE aware
31042 Michael Hendricks (2):
31043 git-send-email: allow an email alias for --from
31044 gitweb: configurable width for the projects list Description column
31047 Document -<n> for git-format-patch
31048 gitweb: prefer git_get_project_owner() over get_file_owner()
31049 gitweb: new cgi parameter: opt
31052 apply delta depth bias to already deltified objects
31053 script to display a distribution of longest common hash prefixes
31054 reduce git-pack-objects memory usage a little more
31056 Paul Mackerras (6):
31057 gitk: Fix the find and highlight functions
31058 gitk: Fix bug in the anc_or_desc routine
31059 gitk: Remove the unused stopfindproc function
31060 gitk: Fix bug causing "can't read commitrow(0,n)" error
31061 gitk: Use git log and add support for --left-right
31062 gitk: Improve handling of -- and ambiguous arguments
31065 diff-lib.c: don't strdup twice
31067 Sean Estabrooks (1):
31068 Alter git-checkout reflog message to include "from" branch
31070 Shawn O. Pearce (46):
31071 git-gui: Unlock the index when cancelling merge dialog
31072 git-gui: Start blame windows as tall as possible
31073 git-gui: Correct resizing of remote branch delete dialog
31074 git-gui: Don't bind F5/M1-R in all windows
31075 git-gui: Bind M1-P to push action
31076 git-gui: Include a Push action on the left toolbar
31077 git-gui: Ensure windows shortcuts always have .bat extension
31078 git-gui: Honor rerere.enabled configuration option
31079 git-gui: New Git version check support routine
31080 git-gui: Skip nicknames when selecting author initials
31081 git-gui: Teach class system to support [$this cmd] syntax
31082 git-gui: Abstract the revision picker into a mega widget
31083 git-gui: Refactor the delete branch dialog to use class system
31084 git-gui: Optimize for newstyle refs/remotes layout
31085 git-gui: Maintain remote and source ref for tracking branches
31086 git-gui: Allow users to match remote branch names locally
31087 git-gui: Fast-forward existing branch in branch create dialog
31088 git-gui: Enhance choose_rev to handle hundreds of branches
31089 git-gui: Sort tags descending by tagger date
31090 git-gui: Option to default new branches to match tracking branches
31091 git-gui: Automatically refresh tracking branches when needed
31092 git-gui: Better handling of detached HEAD
31093 git-gui: Refactor our ui_status_value update technique
31094 git-gui: Refactor branch switch to support detached head
31095 git-gui: Unabbreviate commit SHA-1s prior to display
31096 git-gui: Default selection to first matching ref
31097 git-gui: Allow double-click in checkout dialog to start checkout
31098 git-gui: Extract blame viewer status bar into mega-widget
31099 git-gui: Change the main window progress bar to use status_bar
31100 git-gui: Show a progress meter for checking out files
31101 git-gui: Always use absolute path to all git executables
31102 git-gui: Correct gitk installation location
31103 git-gui: Assume unfound commands are known by git wrapper
31104 git-gui: Treat `git version` as `git --version`
31105 git-gui: Perform our own magic shbang detection on Windows
31106 git-gui: Teach console widget to use git_read
31107 git-gui: Improve the Windows and Mac OS X shortcut creators
31108 git-gui: Correct ls-tree buffering problem in browser
31109 git-gui: Don't linewrap within console windows
31110 git-gui: Paper bag fix for Cygwin shortcut creation
31111 git-gui: Use sh.exe in Cygwin shortcuts
31112 git-gui: Include a space in Cygwin shortcut command lines
31113 Clarify documentation of fast-import's D subcommand
31114 Support wholesale directory renames in fast-import
31115 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
31116 git-gui: Change prior tree SHA-1 verification to use git_read
31118 Steffen Prohaska (1):
31119 filter-branch: added missing warn function
31122 Documentation for git-log --follow
31124 Uwe Kleine-König (2):
31125 stash: end commit log with a newline
31126 repack: don't report "Nothing new to pack." if -q is given
31128 William Pursell (1):
31129 user-manual: fix directory name in git-archive example
31132 Version v1.5.3-rc0; changes since v1.5.2.5:
31133 -------------------------------------------
31136 git-send-email: Add --threaded option
31137 git-send-email: make options easier to configure.
31138 format-patch: Add format.subjectprefix config option
31141 Fix the progress code to output LF only when it is really needed
31142 Add run_command_v_opt_cd: chdir into a directory before exec
31143 Add ability to specify environment extension to run_command
31144 Allow environment variables to be unset in the processes started by run_command
31145 Verbose connect messages to show the IP addresses used
31146 Add another verbosity level to git-fetch
31147 Add a configuration option to control diffstat after merge
31148 Fix push with refspecs containing wildcards
31149 Do not use h_errno after connect(2): the function does not set it
31150 cvsserver: Actually implement --export-all
31151 Avoid perl in t1300-repo-config
31153 Alexandre Julliard (1):
31154 pack-check: Sort entries by pack offset before unpacking them.
31156 Alexandre Vassalotti (1):
31157 git-tag: Fix "can't shift that many".
31159 Andy Whitcroft (3):
31160 cvsimport: add support for new style remote layout
31161 cvsimport: update documentation to include separate remotes option
31162 cvsimport: add <remote>/HEAD reference in separate remotes more
31164 Aneesh Kumar K.V (2):
31165 gitview: Fix the blame interface.
31166 gitview: run blame with -C -C
31168 Benjamin Sergeant (1):
31169 git-p4 fails when cloning a p4 depo.
31171 Brian Gernhardt (1):
31172 Fix t5516-fetch for systems where `wc -l` outputs whitespace.
31175 Fix git-stripspace to process correctly long lines and spaces.
31176 Add test script for git-stripspace.
31177 Add test-script for git-tag
31180 git-mergetool: Allow gvimdiff to be used as a mergetool
31183 Custom compression levels for objects and packs
31184 Alter sha1close() 3rd argument to request flush only
31185 git-repack --max-pack-size: new file statics and code restructuring
31186 git-repack --max-pack-size: write_{object,one}() respect pack limit
31187 git-repack --max-pack-size: split packs as asked by write_{object,one}()
31188 git-repack --max-pack-size: add option parsing to enable feature
31189 pack-objects: clarification & option checks for --max-pack-size
31190 Ensure git-repack -a -d --max-pack-size=N deletes correct packs
31192 Daniel Barkalow (6):
31193 Move remote parsing into a library file out of builtin-push.
31194 Move refspec parser from connect.c and cache.h to remote.{c,h}
31195 Add handlers for fetch-side configuration of remotes.
31196 Update local tracking refs when pushing
31197 Move refspec pattern matching to match_refs().
31198 Fix pushing to a pattern with no dst
31201 Generate tags with correct timestamp (git-svnimport)
31203 Elvis Pranskevichus (1):
31204 Use git-tag in git-cvsimport
31207 git-submodule: Instead of using only annotated tags, use any tags.
31210 git-svn: cleanup: factor out longest_common_path() function
31211 git-svn: test for creating new directories over svn://
31212 git-svn: reduce stat() calls for a backwards compatibility check
31213 git-svn: allow dcommit to retain local merge information
31215 Fernando J. Pereda (1):
31216 Teach mailsplit about Maildir's
31218 Frank Lichtenheld (11):
31219 t9400: Add test cases for config file handling
31220 t9400: Add some more cvs update tests
31221 t9400: Add some basic pserver tests
31222 t9400: Work around CVS' deficiencies
31223 cvsserver: Handle 'cvs login'
31224 cvsserver: Make req_Root more critical of its input data
31225 cvsserver: Add some useful commandline options
31226 cvsserver: Let --base-path and pserver get along just fine
31227 cvsserver: Actually implement --export-all
31228 config: Add --null/-z option for null-delimted output
31229 config: add support for --bool and --int while setting values
31232 Unify write_index_file functions
31235 git-branch: cleanup config file when deleting branches
31236 git-svn: trailing slash in prefix is mandatory with --branches/-b
31237 git-cvsimport: force checkout of working tree after initial import
31239 Han-Wen Nienhuys (28):
31241 reformatting: break long lines.
31242 rename apply() to applyCommit(); apply is a python builtin
31243 add .dotest to .gitignore
31244 Robustness fixes for pipes
31247 clone and sync --keep-path to keep perforce path to module.
31248 use string.strip() iso. slicing.
31249 use strip() iso. slicing for removing \n
31250 add --verbose to all commands.
31251 Extract multiple paths concurrently.
31253 remove global .gitdir
31254 Read p4 files in one batch.
31255 Thinko, fix buglet.
31256 store p4 user cache in home directory.
31258 read files before creating the commit.
31259 don't p4 print deleted files.
31260 only run p4 print if necessary
31261 use p4CmdList() to get file contents in Python dicts. This is more robust.
31262 Cleanups & import into p4/master for local import
31264 thinko: really ignore deleted files.
31265 look for 'text' and 'binary' files.
31266 print error message when p4 print fails (eg. due to permission problems)
31267 also strip p4/ from local imports.
31269 Jakub Narębski (16):
31270 gitweb: Add test t9500 for gitweb (as standalone script)
31271 Add an option to git-ls-tree to display also the size of blob
31272 gitweb: Provide links to commitdiff to each parent in 'commitdiff' view
31273 gitweb: Improve "next" link in commitdiff view
31274 gitweb: Split git_patchset_body into separate subroutines
31275 gitweb: Create special from-file/to-file header for combined diff
31276 gitweb: Add links to blobdiffs in from-file/to-file header for merges
31277 gitweb: '--cc' for merges in 'commitdiff' view
31278 Document git rev-list --full-history
31279 Document git read-tree --trivial
31280 Document git rev-parse --is-inside-git-dir
31281 Document git reflog --stale-fix
31282 Document git rev-list --timestamp
31283 Use tabs for indenting definition list for options in git-log.txt
31284 Document git log --abbrev-commit, as a kind of pretty option
31285 Document git log --full-diff
31288 Add colour support in rebase and merge tree diff stats output.
31289 rev-parse: Identify short sha1 sums correctly.
31292 cmd_log_init: remove parsing of --encoding command line parameter
31293 refactor dir_add_name
31294 dir_struct: add collect_ignored option
31295 builtin-add: simplify (and increase accuracy of) exclude handling
31296 Fix ALLOC_GROW off-by-one
31297 Fix ALLOC_GROW calls with obsolete semantics
31298 git-stash: fix "no arguments" case in documentation
31299 git-stash: fix "can't shift that many" with no arguments
31300 git-stash: don't complain when listing in a repo with no stash
31301 Documentation: quote {non-attributes} for asciidoc
31302 Documentation: quote {non-attributes} for asciidoc
31303 Documentation: minor cleanups to branch/checkout wording
31305 Jeffrey C. Ollie (2):
31306 Add an option to quiet git-init.
31307 Quiet the output from git-init when cloning, if requested.
31310 Don't dereference a strdup-returned NULL
31311 detect close failure on just-written file handles
31312 Don't ignore a pack-refs write failure
31313 git-log: detect dup and fdopen failure
31316 Remove unnecessary code and comments on non-existing 8kB tag object restriction
31318 Johannes Schindelin (23):
31319 Update to SubmittingPatches
31320 Add git-filter-branch
31321 git-fsck: learn about --verbose
31322 Move buffer_is_binary() to xdiff-interface.h
31323 merge-recursive: refuse to merge binary files
31324 git-merge-file: refuse to merge binary files
31325 filter-branch: use $(($i+1)) instead of $((i+1))
31326 filter-branch: fix behaviour of '-k'
31327 t5000: skip ZIP tests if unzip was not found
31328 Teach filter-branch about subdirectory filtering
31329 Teach diff to imply --find-copies-harder upon -C -C
31330 pp_header(): work around possible memory corruption
31331 diffcore-rename: favour identical basenames
31332 filter-branch: add example to move everything into a subdirectory
31333 Move the pick_author code to git-sh-setup
31334 Teach rebase an interactive mode
31335 rebase -i: several cleanups
31336 rebase -i: provide reasonable reflog for the rebased branch
31337 Teach rebase -i about --preserve-merges
31338 t7004: ship trustdb to avoid gpg warnings
31339 git add: respect core.filemode with unmerged entries
31340 Make '!' aliases more useful
31341 git-fsck: add --lost-found option
31344 filter-branch: Use rev-list arguments to specify revision ranges.
31345 filter-branch: also don't fail in map() if a commit cannot be mapped
31346 Makefile: Remove git-merge-base from PROGRAMS.
31347 filter-branch: Simplify parent computation.
31348 filter-branch: subdirectory filter needs --full-history
31349 Avoid double-slash in path names that depend on $(sharedir).
31350 Remove trailing slash from $(template_dir).
31351 git-remote show: Also shorten non-fast-forward refs in the 'push' listing
31352 Test 'git add' for unmerged entries when core.symlinks=false.
31355 Add the --numbered-files option to git-format-patch.
31358 Fix git-am(1) synopsis formatting
31359 git-rebase: suggest to use git-add instead of git-update-index
31362 Fix typo in git-mergetool
31364 Julian Phillips (2):
31365 Makefile: Use generic rule to build test programs
31366 new-workdir: handle rev-parse --git-dir not always giving full path
31368 Junio C Hamano (48):
31369 git-apply: Fix removal of new trailing blank lines.
31370 pack-objects: pass fullname down to add_object_entry()
31371 Teach "delta" attribute to pack-objects.
31372 builtin-pack-objects: remove unnecessary code for no-delta
31373 Fix command line parameter parser of revert/cherry-pick
31374 Remove git-applypatch
31375 mailsplit: fix for more than one input files
31376 Add DLH to .mailmap
31377 Release Notes: start preparing for 1.5.3
31378 git-apply: what is detected and fixed is not just trailing spaces.
31379 t7003: make test repeatable
31380 git-branch --track: fix tracking branch computation.
31382 Test wildcard push/fetch
31383 More missing static
31384 More missing static
31385 Even more missing static
31386 remote.c: refactor match_explicit_refs()
31387 remote.c: refactor creation of new dst ref
31388 remote.c: minor clean-up of match_explicit()
31389 remote.c: fix "git push" weak match disambiguation
31390 remote.c: "git-push frotz" should update what matches at the source.
31391 git-push: Update description of refspecs and add examples
31392 git-blame: do not indent with spaces.
31393 git-blame -w: ignore whitespace
31394 mktag: minimally update the description.
31395 Lift 16kB limit of log message output
31396 Extend --pretty=oneline to cover the first paragraph,
31397 Makefile: common-cmds.h depends on generate-cmdlist.sh script
31398 Makefile: allow generating git.o for debugging purposes
31399 -Wold-style-definition fix
31401 Documentation: update "stale" links for 1.5.2.2
31402 INSTALL: explain how to build documentation
31403 Two trivial -Wcast-qual fixes
31404 git-send-email: Do not make @-less message ID
31405 Add core.quotepath configuration variable.
31406 Update draft Release Notes for 1.5.3
31407 diffcore_count_changes: pass diffcore_filespec
31408 diffcore_filespec: add is_binary
31409 diffcore-delta.c: update the comment on the algorithm.
31410 diffcore-delta.c: Ignore CR in CRLF for text files
31411 git-stash: require "save" to be explicit and update documentation
31412 Update public documentation links for 1.5.2.3
31413 "git-push $URL" without refspecs pushes only matching branches
31414 Rewrite "git-frotz" to "git frotz"
31415 git-stash: make "save" the default action again.
31416 Mark disused commit walkers officially deprecated.
31419 git-p4: check for existence of repo dir before trying to create
31422 Add git-submodule command
31423 Add basic test-script for git-submodule
31424 git-submodule: move cloning into a separate function
31425 git-submodule: clone during update, not during init
31426 t7400: barf if git-submodule removes or replaces a file
31427 git-submodule: remember to checkout after clone
31428 Rename sections from "module" to "submodule" in .gitmodules
31429 git-submodule: give submodules proper names
31431 gitmodules(5): remove leading period from synopsis
31433 Linus Torvalds (9):
31434 Make "git gc" pack all refs by default
31435 Make the pack-refs interfaces usable from outside
31436 Makefile: add an explicit rule for building assembly output
31437 Finally implement "git log --follow"
31438 Fix up "git log --follow" a bit..
31439 Clean up internal command handling
31440 Check for IO errors after running a command
31441 git: Try a bit harder not to lose errno in stdio
31442 Start deprecating "git-command" in favor of "git command"
31444 Marco Costalba (1):
31445 Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
31447 Marius Storm-Olsen (7):
31448 Make the command call silent
31449 Replace \r\n with \n when importing from p4 on Windows
31450 Ensure that the commit message is Windows formated (CRLF) before invoking the editor.
31451 Fix git-p4 clone (defaultDestination)
31452 Fix single branch import into remotes
31453 Exclude the HEAD symbolic ref from the list of known branches
31454 Only use double quotes on Windows
31457 gitk: Make selection highlight color configurable
31458 gitk: Update fontsize in patch / tree list
31459 gitk: Allow specifying tabstop as other than default 8 characters.
31460 gitweb.perl - Optionally send archives as .zip files
31461 gitk: Use a spinbox for setting tabstop settings
31462 gitk: Update selection background colorbar in prefs dialog
31464 Martin Koegler (5):
31465 builtin-pack-objects: don't fail, if delta is not possible
31466 git-pack-objects: cache small deltas between big objects
31467 builtin-pack-object: cache small deltas
31468 diff-delta: use realloc instead of xrealloc
31469 gitweb: Handle non UTF-8 text better
31472 rename dirlink to gitlink.
31474 Matthias Lederhofer (18):
31475 add git-filter-branch to .gitignore
31476 make clean should remove all the test programs too
31477 filter-branch: prevent filters from reading from stdin
31478 chmod +x git-filter-branch.sh
31479 rev-parse: document --is-inside-git-dir
31480 rev-parse: introduce --is-bare-repository
31482 introduce GIT_WORK_TREE to specify the work tree
31483 Use new semantics of is_bare/inside_git_dir/inside_work_tree
31484 extend rev-parse test for --is-inside-work-tree
31486 setup_git_directory: fix segfault if repository is found in cwd
31487 filter-branch: always export GIT_DIR if it is set
31488 gitweb: change filename/directory name of snapshots
31489 make git barf when an alias changes environment variables
31490 make dist: include configure script in tarball
31491 ignore git-rebase--interactive
31492 getenv/setenv: use constants if available
31494 Matthijs Melchior (1):
31495 Teach git-tag about showing tag annotations.
31497 Michael Ellerman (2):
31498 gitview: Use new-style classes
31499 gitview: Define __slots__ for Commit
31501 Michael Krelin (1):
31502 git-svn: honor ~/.subversion/ client cert file settings.
31504 Michael S. Tsirkin (1):
31505 connect: display connection progress
31507 Nanako Shiraishi (3):
31508 Cloning from a repo without "current branch"
31509 Add git-stash script
31513 allow for undeltified objects not to be reused
31514 make "repack -f" imply "pack-objects --no-reuse-object"
31515 deprecate the new loose object header format
31516 fixes to output of git-verify-pack -v
31517 improve delta long block matching with big files
31518 update diff-delta.c copyright
31519 fix repack with --max-pack-size
31520 always start looking up objects in the last used pack first
31522 Paul Mackerras (18):
31523 gitk: Use the -q flag to git checkout
31524 gitk: New infrastructure for working out branches & previous/next tags
31525 gitk: Don't try to list large numbers of tags or heads in the details pane
31526 gitk: Add some more comments to the optimize_rows procedure
31527 gitk: Improve the behaviour of the initial selection
31528 gitk: Implement a simple scheduler for the compute-intensive stuff
31529 gitk: Cope with commit messages with carriage-returns and initial blank lines
31530 gitk: Disable the head context menu entries for the checked-out branch
31531 gitk: Store ids in rowrangelist and idrowranges rather than row numbers
31532 gitk: New algorithm for drawing the graph lines
31533 gitk: Show local uncommitted changes as a fake commit
31534 gitk: Speed up the reading of references
31535 gitk: Get rid of the childlist variable
31536 gitk: Add a "reset branch to here" row context-menu operation
31537 gitk: Limit how often we change the canvas scrolling region
31538 gitk: Fix bug causing nearby tags/heads to sometimes not be displayed
31539 gitk: Improve handling of whitespace and special chars in filenames
31540 gitk: Add a progress bar to show progress while resetting
31543 git-rev-list: Add regexp tuning options
31544 git-applymbox: Remove command
31546 Pierre Habouzit (3):
31547 $EMAIL is a last resort fallback, as it's system-wide.
31548 Active_nr is unsigned, hence can't be < 0
31552 git.spec: RPM failed, looking for wrong files.
31554 Randal L. Schwartz (1):
31555 Add test-sha1 to .gitignore.
31558 t5000: silence unzip availability check
31559 diffcore-rename: don't change similarity index based on basename equality
31560 diff: round down similarity index
31562 Robin Rosenberg (1):
31563 Add option to cvs update before export
31566 git-svn: avoid string eval for defining functions
31567 git-svn: use git-log rather than rev-list | xargs cat-file
31568 git-svn: cache max revision in rev_db databases
31570 Shawn O. Pearce (24):
31571 Teach git-describe how to run name-rev
31572 Lazily open pack index files on demand
31573 Micro-optimize prepare_alt_odb
31574 Attempt to delay prepare_alt_odb during get_sha1
31576 git-gui: GUI support for running 'git remote prune <name>'
31577 git-gui: Show the git-gui library path in 'About git-gui'
31578 git-gui: Enable verbose Tcl loading earlier
31579 git-gui: Provide fatal error if library is unavailable
31580 git-gui: Disable tearoff menus on Windows, Mac OS X
31581 git-gui: Allow users to rename branches through 'branch -m'
31582 git-gui: Allow users to delete remote branches
31583 git-gui: Expose the merge.diffstat configuration option
31584 Allow contrib new-workdir to link into bare repositories
31585 Test for recent rev-parse $abbrev_sha1 regression
31586 Simplify index access condition in count-objects, pack-redundant
31587 Ensure the pack index is opened before access
31588 Style nit - don't put space after function names
31589 git-gui: Internalize symbolic-ref HEAD reading logic
31590 git-gui: Quiet our installation process
31591 Avoid src:dst syntax as default bash completion for git push
31592 Document git-gui, git-citool as mainporcelain manual pages
31593 Teach bash how to complete +refspec on git-push
31594 Correct usages of sed in git-tag for Mac OS X
31596 Simon Hausmann (223):
31597 Initial import of a python script to import changesets from Perforce into git.
31598 Added basic support for specifying the depot path to import from as well as the range of perforce changes.
31599 Slightly improved help usage output and made specifying the trailing slash for the depot path optional.
31600 Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.
31601 Some fixes to the timezone conversion between the date of a perforce change and the git commit.
31602 Speed up the import of individual files from Perforce into git by passing the output of "p4 print" directly to git fast-import. Also try to set the mode of the file in git correctly based on file type heuristics.
31603 Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).
31604 Changed the import mechanism to write to git fast-import through a pipe instead of having p4-fast-export write to stdout and let the caller connect it to git fast-import.
31605 Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.
31606 Instead of parsing the output of "p4 users" use the python objects of "p4 -G users".
31607 Ported the remaining functions that parsed p4 shell output over to the p4 python interface.
31608 Avoid calling fstat for every imported file (slow!) and instead read the file data first into the python process and use the length of the bytes read for the size field of git fast-import.
31609 Permit calling p4-fast-export with a depot path that has the typical ... wildcard at the end.
31610 Fixed displaying import progress by calling flush on stdout.
31611 Create a git tag for every changeset imported from perforce.
31612 Fix file permissions of p4-fast-export.py to be executable.
31613 Started working on incremental imports from Perforce.
31614 Simplify the incremental import by elimination the need for a temporary import branch.
31615 Code cleanups, move the code to create a commit with fast-import into a separate function out of the main loop.
31616 Initial support for importing a directory from Perforce at a specified revision.
31617 Minor cleanups and print an error message of git fast-import if it fails.
31618 Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
31619 Make incremental imports easier to use by storing the p4 depot path after an import in .git/config and re-using it when we're invoked again later.
31620 Make specifying the revision ranges more convenient.
31621 Fix calculation of the newest imported revision for #head imports.
31622 Catch io exceptions from git fast-import again and print the error message.
31623 Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option.
31624 Added a little helper script to debug the output of the p4 python interface.
31625 Minor code cleanups.
31626 Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change.
31627 Changed the default git import branch from "p4" to "master".
31628 Added a little helper script to remove unused tags from the perforce import.
31629 Create lightweight git tags (using the "reset" trick) for the incremental import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number.
31630 Cleanups, remove unused variable.
31632 Started work on p4 branch detection (experimental!).
31633 More fixes in heuristic p4 branch detection based on common path components.
31634 After marking a p4 branch as merged don't ever merge it in git again.
31635 Set git fast-import marks for every imported change for future use.
31636 When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
31637 Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection.
31638 Use sets.Set() instead of set() to run also with older versions of Python.
31639 Fix single-branch imports by skipping the branch/merge detection correctly.
31640 Added p4 delete behavioural emulation as todo item.
31641 Added support for --silent so that p4-fast-export can be called from cronjobs.
31642 More work in --silent support.
31643 Don't print a plain newline at the end of the execution (avoids bogus cron error mails).
31644 Adjust the output parsing of git name-rev to handle the output of the latest git version.
31645 Work in progress on detecting branches.
31646 Changed --known-branches to take a file as argument instead of a comma separated list.
31647 Fixed p4-debug file extension.
31648 Make the p4 data/command cache configurable through the --cache-debug commandline option.
31649 Minor code cleanups.
31650 More code cleanups and preparations for more branch detection heuristics.
31651 More work on branch detection by implementing changeIsBranchMerge().
31652 Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.
31653 Split up the cache commandline options into (command) cache and data cache.
31654 First version of a new script to submit changes back to perforce from git repositories.
31655 Fix git-dir option and allow reading log substitutions from a file
31656 Lots of bugfixes to p4-git-sync.
31657 Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
31658 Be nice and use /usr/bin/env python for the git-p4 scripts
31659 Ignore Apple resource files when importing from perforce to git.
31660 Auto-detect the current git branch before submitting back to perforce.
31661 Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
31662 Default to interactive syncing
31663 Improved the git dir detection.
31664 Pass the right number of arguments to commit, fixes single-branch imports.
31665 Start moving the git-p4 tools into one single script.
31666 Provide a little bit of help description for the git-p4 "tools".
31667 First (untested) attempt at migrating p4-git-sync into the final git-p4 script
31668 Part of the code is copyright by Trolltech ASA.
31669 sync-to-perforce is now called submit and fixed the gitdir check a little bit
31670 Completely untested "merge" of p4-fast-export.py into git-p4.py
31671 Added missing "self"s to make the script evaluate correctly.
31672 Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
31673 Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
31674 Start of the git-p4 documentation.
31675 Documentation enhancements.
31676 Added experimental but super-fast --apply-as-patch option to git-p4 submit
31677 Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.
31678 Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
31679 Make it possible to invoke git-p4 from within subdirectories of a git working tree.
31680 Don't show the submit template and the diff first in less but show it in $editor right away
31681 Removed the .py extension from git-p4 as it's annoying to type every time.
31682 Changed the format of the imported log message slightly, so that it's easier to parse again.
31683 Changed the default branch for imports from "master" to "p4"
31684 Added some helper function(s) to parse the depot path and change number from the log message
31685 Helper function to check the existance of a revision
31686 Set the default branch in run, not in the constructor
31687 Brand new smart incremental import that doesn't need tags or git repo-config :)
31688 Make it possible to run git-p4 submit from within the git repository
31689 Use the new incremental import style by default
31690 Different versions of p4 have different output for the where command ;(
31691 Minor cosmetic fixlet for the git-p4 submit sync question.
31692 Prefer git command over git-command.
31693 Don't try to parse any options with git-p4 debug but pass it straight on to p4
31694 git-p4 debug doesn't need a git repository
31695 Added support for mapping p4 labels to git tags
31696 Fix variable usage in tag import
31697 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into simply git-p4 submit mytopicbranch.
31698 Fix "compilation" :)
31699 Clean up python class names.
31700 Added git-p4 rebase convenience
31701 Provide a tree summary after git-p4 rebase
31702 Turn off potentially slow label detection by default
31703 Honor --silent for labels
31704 Added git-p4 clone convenience command
31705 Fix file determination for #head imports
31706 fix variable usage (oops)
31707 Added a simple example of usage to the "documentation" :)
31708 Allow for convenient rebasing after git-p4 submit
31709 Print an error message of some sort if git fast-import fails.
31710 Fix the timezone formatting. Now qgit also displays (parses) it correctly.
31711 Removed the old patch apply code from git-p4 submit.
31712 Slightly improved formatting of the raw_input questions.
31713 A new attempt at fixing the child-fast-import-process-not-finished race condition in the clone command
31714 Handle patch errors in git-p4 submit better.
31717 cleanup, renamed self.globalPrefix to self.depotPath
31718 Cleanup, removed the old tagging code
31719 Document some implementation details, for the curious... :)
31720 Use the subprocess module instead of popen2 to make it work on Windows.
31721 Added a little .bat wrapper from Marius
31722 Make sure all popen calls use binary mode (for Windows) and
31723 Make submitting work on Windows.
31724 Converted to unix newlines
31725 Fix git-p4 clone //depot/project (head import)
31726 Make git-p4 work with bare repositories.
31727 Added the possibility of skipping patches during git-p4 submit
31728 Give a better hint if git-p4 submit fails
31729 Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
31730 A little todo note before I forget it :), based on a suggestion from Lars.
31731 Fixing syncing (gitdir discovery / cd) for bare repositories
31732 Always pass a sha1 for the initial parent so that git-fast-import doesn't think it's creating a new branch from itself. It's a sensible error in general but in the case of incremental imports we have to apply force :)
31733 Clean up code duplication for revision parsing and fix previous commit to not import into remotes/p4 (yet!).
31734 Removed cleantags command. It doesn't have any meaning anymore.
31735 Removed ancient and unused code to find the last imported revision from previous imports to use for the current import by looking at the p4 tags. The current approach of using the log message works better.
31736 Create the origin based import branch using git update-ref instead of git branch so that it's possible to have the import branch in refs/remotes.
31737 Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} instead of refs/heads/p4.
31738 Bite the bullet and automatically convert old style refs/heads/p4 repositories to the new style refs/remotes/p4 branching.
31739 Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
31740 Removed todo item that is implemented :)
31741 Fix branch setup after initial clone.
31742 Removed unused cache variables.
31743 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
31744 Give branches a nice project prefix and don't bail out on clone if we failed to detect the master branch.
31745 More work on the incremental importing of multiple branches. Improved error detection by checking the exit code of git-fast-import.
31746 Cleanup/speed up the branch<> file split and removed change range limitation that I added for debugging (oops).
31747 More cleanups and speedups for labels and branches
31748 Removed unused variable, more cleanups
31749 Cache the output of "p4 users" for faster syncs on high latency links.
31750 Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
31751 Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
31752 Use git format-patch and git apply --apply when extracting patches from git and applying them to a Perforce checkout. This should make it possible to apply git commits with binary files that cannot be handled by path.
31753 Added support for git-p4 submit --direct (experimental)
31754 Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found.
31755 Had an idea for debugging, record it :)
31756 Another (potentially life-saving) idea for submit --direct
31757 Improved output for multi branch imports and noted another little todo item
31758 Fix conversion from old style heads/p4 to remotes/p4/master
31759 Fix error detection with git-p4 submit when the requested depot path is not in the client view.
31760 Fix git symbolic-ref warning on initial clone
31761 Detect with git-p4 submit --direct when there are no changes in the working directory
31762 Make git-p4 submit --direct safer by also creating a git commit
31763 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
31764 Fix branch detection in multi-branch imports
31765 Fixes for rollback, delete branches that did not exist at the specified p4 change
31766 Added support for importing multiple branches into refs/heads instead of just refs/remotes using --import-local. Needs some further microfix but seems to work otherwise.
31767 Added support for --max-changes=<count> to ease import debugging
31768 Use refs/heads/* instead of refs/heads/p4/* for local imports
31770 Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
31771 Make rollback work with locally imported branches
31772 Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
31773 Oops, fill the /list/ correct with the p4 exit code.
31774 Catch p4 errors in rollback early enough (before deleting refs!)
31775 Fix p4 execution in git-p4 rollback.
31776 Fix multi-branch import with --silent.
31777 Load the user map from p4 only once at run-time.
31778 Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
31779 Forgot to remove this return statement from debugging
31780 Added support for --with-origin with multi-branch imports
31781 Oops, fix --with-origin to /really/ also call git fetch :)
31782 Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
31783 Make git-p4 work with packed refs (don't use os.path.exists to check for the existance of a ref)
31784 Make --with-origin also work without origin :)
31785 Make --with-origin the default for syncing.
31786 Shortcut the case where we have no origin branch
31787 Forgot to remove this TODO item when I made --with-origin the default :)
31788 Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
31789 Fix creation of refs/remotes/p4/HEAD symbolic ref
31790 Fix my email address, this isn't really KDE related :)
31791 In *_pipe print the command that failed if it fails. Fixed old calls to mypopen.
31792 Fix typo in listExistingP4Branches that broke sync.
31793 Fix support for "depot-path" in older git-p4 imports
31794 Fix common path "calculation" from logs of multiple branches. Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one.
31795 Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :)
31796 Hack to make the multi-branch import work again with self.depotPaths now that self.depotPath is gone
31799 Fix depot-path determination for git-p4 submit
31800 Make clone behave like git clone by default again.
31801 Make git-p4 submit detect the correct reference (origin) branch when working with multi-branch imports.
31802 Only get the expensive branch mapping from the p4 server when not syncing with the help of an origin remote (which we instead then use to get new branches from).
31803 Fixed the check to make sure to exclude the HEAD symbolic refs when updating the remotes/p4 branches from origin.
31804 Fix updating/creating remotes/p4/* heads from origin/p4/*
31805 Fix project name guessing
31806 Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
31807 Fix support for explicit disabling of syncing with the origin
31808 Write out the options tag in the log message of imports only if we actually have options
31809 Provide some information for single branch imports where the commits go
31810 Mention remotes/p4/master also in the documentation.
31811 git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames
31812 Moved the code from git-p4 submit to figure out the upstream branch point into a separate helper method.
31813 Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally always rebasing on top of remotes/p4/master
31814 Fix initial multi-branch import.
31815 Fix the branch mapping detection to be independent from the order of the "p4 branches" output.
31816 Warn about conflicting p4 branch mappings and use the first one found.
31817 Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches.
31818 Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
31819 git-new-workdir: Fix shell warning about operator == used with test.
31821 Sven Verdoolaege (4):
31822 git-update-ref: add --no-deref option for overwriting/detaching ref
31823 t9500: skip gitweb tests if perl version is too old
31824 git-submodule: provide easy way of adding new submodules
31825 git-clone: fetch possibly detached HEAD over dumb http
31828 Add --aggressive option to 'git gc'
31829 Fix minor grammatical typos in the git-gc man page
31830 git-mergetool: Make default selection of merge-tool more intelligent
31831 Don't fflush(stdout) when it's not helpful
31834 Change default man page path to /usr/share/man
31837 Version v1.5.2.5; changes since v1.5.2.4:
31838 -----------------------------------------
31840 Christian Couder (1):
31841 rev-list --bisect: fix allocation of "int*" instead of "int".
31843 Julian Phillips (1):
31844 Force listingblocks to be monospaced in manpages
31846 Junio C Hamano (4):
31847 Do not expect unlink(2) to fail on a directory.
31848 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
31849 Fix "git add -u" data corruption.
31852 Linus Torvalds (1):
31853 apply: remove directory that becomes empty by renaming the last file away
31855 Salikh Zakirov (1):
31856 git-add -u paths... now works from subdirectory
31859 Version v1.5.2.4; changes since v1.5.2.3:
31860 -----------------------------------------
31863 Make git-prune submodule aware (and fix a SEGFAULT in the process)
31864 user-manual: grammar and style fixes
31867 git-gui: properly popup error if gitk should be started but is not installed
31869 J. Bruce Fields (2):
31871 user-manual: more explanation of push and pull usage
31874 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
31876 Johannes Schindelin (3):
31877 diff --no-index: fix --name-status with added files
31878 glossary: add 'reflog'
31879 Fix "apply --reverse" with regard to whitespace
31881 Junio C Hamano (2):
31882 Teach read-tree 2-way merge to ignore intermediate symlinks
31885 Michael Hendricks (1):
31886 Correctly document the name of the global excludes file configuration
31889 Document -<n> for git-format-patch
31891 Shawn O. Pearce (10):
31892 git-gui: Unlock the index when cancelling merge dialog
31893 git-gui: Don't bind F5/M1-R in all windows
31894 git-gui: Bind M1-P to push action
31895 git-gui: Include a Push action on the left toolbar
31896 git-gui: Ensure windows shortcuts always have .bat extension
31897 git-gui: Skip nicknames when selecting author initials
31898 git-gui: Correct ls-tree buffering problem in browser
31899 git-gui: Don't linewrap within console windows
31900 Clarify documentation of fast-import's D subcommand
31901 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
31903 William Pursell (1):
31904 user-manual: fix directory name in git-archive example
31907 Version v1.5.2.3; changes since v1.5.2.2:
31908 -----------------------------------------
31910 Frank Lichtenheld (2):
31911 config: Complete documentation of --get-regexp
31912 config: Change output of --get-regexp for valueless keys
31914 Junio C Hamano (1):
31917 Linus Torvalds (1):
31918 Fix zero-object version-2 packs
31921 Correct the name of NO_R_TO_GCC_LINKER in the comment describing it.
31924 cleanup merge-base test script
31925 repack: improve documentation on -a option
31926 git-remote: document -n
31928 Shawn O. Pearce (5):
31929 git-gui: Correctly install to /usr/bin on Cygwin
31930 git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
31931 git-gui: Don't require $DISPLAY just to get --version
31932 git-gui: Don't nice git blame on MSYS as nice is not supported
31933 git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
31935 Sven Verdoolaege (1):
31936 Ignore submodule commits when fetching over dumb protocols
31939 Version v1.5.2.2; changes since v1.5.2.1:
31940 -----------------------------------------
31943 Make the installation target of git-gui a little less chatty
31944 Fix clone to setup the origin if its name ends with .git
31945 Add a local implementation of hstrerror for the system which do not have it
31948 Fix typo in remote branch example in git user manual
31950 J. Bruce Fields (4):
31951 user-manual: quick-start updates
31952 user-manual: add a missing section ID
31953 Documentation: user-manual todo
31954 tutorial: use "project history" instead of "changelog" in header
31956 Jakub Narębski (1):
31957 Generated spec file to be ignored is named git.spec and not git-core.spec
31959 Johannes Schindelin (2):
31960 Move buffer_is_binary() to xdiff-interface.h
31961 merge-recursive: refuse to merge binary files
31964 Accept dates before 2000/01/01 when specified as seconds since the epoch
31966 Junio C Hamano (6):
31967 checkout: do not get confused with ambiguous tag/branch names
31968 $EMAIL is a last resort fallback, as it's system-wide.
31969 git-branch --track: fix tracking branch computation.
31970 Avoid diff cost on "git log -z"
31971 Documentation: adjust to AsciiDoc 8
31974 Kristian Høgsberg (1):
31975 Unquote From line from patch before comparing with given from address.
31977 Luiz Fernando N. Capitulino (1):
31978 git-cherry: Document 'limit' command-line option
31980 Matthijs Melchior (1):
31981 New selection indication and softer colors
31983 Michael Milligan (1):
31984 git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
31987 fix documentation of unpack-objects -n
31988 Don't assume tree entries that are not dirs are blobs
31990 Shawn O. Pearce (47):
31991 git-gui: Allow creating a branch when none exists
31992 git-gui: Allow as few as 0 lines of diff context
31993 git-gui: Don't quit when we destroy a child widget
31994 git-gui: Attach font_ui to all spinbox widgets
31995 git-gui: Verify Tcl/Tk is new enough for our needs
31996 Revert "Make the installation target of git-gui a little less chatty"
31997 git-gui: Add a 4 digit commit abbreviation to the blame viewer
31998 git-gui: Cleanup blame::new widget initialization
31999 git-gui: Remove empty blank line at end of blame
32000 git-gui: Improve the coloring in blame viewer
32001 git-gui: Simplify consecutive lines that come from the same commit
32002 git-gui: Use arror cursor in blame viewer file data
32003 git-gui: Display tooltips in blame viewer
32004 git-gui: Highlight the blame commit header from everything else
32005 git-gui: Remove unnecessary reshow of blamed commit
32006 git-gui: Cleanup minor style nit
32007 git-gui: Space the commit group continuation out in blame view
32008 git-gui: Show author initials in blame groups
32009 git-gui: Allow the user to control the blame/commit split point
32010 git-gui: Display a progress bar during blame annotation gathering
32011 git-gui: Allow digging through history in blame viewer
32012 git-gui: Combine blame groups only if commit and filename match
32013 git-gui: Show original filename in blame tooltip
32014 git-gui: Use a label instead of a button for the back button
32015 git-gui: Clip the commit summaries in the blame history menu
32016 git-gui: Remove the loaded column from the blame viewer
32017 git-gui: Remove unnecessary space between columns in blame viewer
32018 git-gui: Use lighter colors in blame view
32019 git-gui: Make the line number column slightly wider in blame
32020 git-gui: Automatically expand the line number column as needed
32021 git-gui: Remove unused commit_list from blame viewer
32022 git-gui: Better document our blame variables
32023 git-gui: Cleanup redundant column management in blame viewer
32024 git-gui: Switch internal blame structure to Tcl lists
32025 git-gui: Label the uncommitted blame history entry
32026 git-gui: Rename fields in blame viewer to better descriptions
32027 git-gui: Display the "Loading annotation..." message in italic
32028 git-gui: Run blame twice on the same file and display both outputs
32029 git-gui: Display both commits in our tooltips
32030 git-gui: Jump to original line in blame viewer
32031 git-gui: Use three colors for the blame viewer background
32032 git-gui: Improve our labeling of blame annotation types
32033 git-gui: Favor the original annotations over the recent ones
32034 git-gui: Changed blame header bar background to match main window
32035 git-gui: Include 'war on whitespace' fixes from git.git
32036 git-gui: Give amend precedence to HEAD over MERGE_MSG
32037 git-gui: Save geometry before the window layout is damaged
32039 William Pursell (1):
32040 Make command description imperative statement, not third-person present.
32043 Version v1.5.2.1; changes since v1.5.2:
32044 ---------------------------------------
32047 Fix mishandling of $Id$ expanded in the repository copy in convert.c
32048 Add test case for $Id$ expanded in the repository
32051 fix memory leak in parse_object when check_sha1_signature fails
32054 git-svn: avoid md5 calculation entirely if SVN doesn't provide one
32056 Fernando J. Pereda (1):
32057 Use PATH_MAX instead of TEMPFILE_PATH_LEN
32059 Frank Lichtenheld (7):
32060 t1300: Add tests for git-config --bool --get
32061 git-config: Correct asciidoc documentation for --int/--bool
32062 cvsserver: Correct inetd.conf example in asciidoc documentation
32063 cvsserver: Note that CVS_SERVER can also be specified as method variable
32064 cvsserver: Fix some typos in asciidoc documentation
32065 git-config: Various small fixes to asciidoc documentation
32066 git-config: Improve documentation of git-config file handling
32068 Jakub Narębski (3):
32069 Documentation: Clean up links in GIT Glossary
32070 Replace the last 'dircache's by 'index'
32071 Documentation: Add definition of "evil merge" to GIT Glossary
32074 Documentation: fix git-config.xml generation
32076 James Y Knight (1):
32077 Fix git-svn to handle svn not reporting the md5sum of a file, and test.
32080 git-am: use printf instead of echo on user-supplied strings
32081 More echo "$user_message" fixes.
32082 Documentation: robustify asciidoc GIT_VERSION replacement
32084 Jerald Fitzjerald (1):
32085 decode_85(): fix missing return.
32088 git-daemon: don't ignore pid-file write failure
32091 Fix stupid typo in lookup_tag()
32093 Johannes Schindelin (2):
32094 SubmittingPatches: mention older C compiler compatibility
32095 git-status: respect core.excludesFile
32098 branch: fix segfault when resolving an invalid HEAD
32099 Update bash completion to ignore some more plumbing commands
32102 Create a new manpage for the gitignore format, and reference it elsewhere
32104 Junio C Hamano (6):
32105 annotate: make it work from subdirectories.
32106 git-cvsserver: fix disabling service via per-method config
32107 name-rev: tolerate clock skew in committer dates
32108 git-commit: use printf '%s\n' instead of echo on user-supplied strings
32109 Add tests for the last two fixes.
32112 Kristian Høgsberg (1):
32113 Use =20 when rfc2047 encoding spaces.
32115 Linus Torvalds (1):
32116 fix signed range problems with hex conversions
32118 Nguyễn Thái Ngọc Duy (1):
32119 Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
32122 Document branch.autosetupmerge.
32124 Shawn O. Pearce (12):
32125 git-gui: Tighten internal pattern match for lib/ directory
32126 Refactor fast-import branch creation from existing commit
32127 Fix possible coredump with fast-import --import-marks
32128 Hide the plumbing diff-{files,index,tree} from bash completion
32129 Teach bash completion about git-shortlog
32130 Remove a duplicate --not option in bash completion
32131 Update bash completion header documentation
32132 Teach bash completion about 'git remote update'
32133 Teach bash completion about recent log long options
32134 Update bash completion for git-config options
32135 Correct key bindings to Control-<foo>
32136 git-gui: Guess our share/git-gui/lib path at runtime if possible
32138 Simon Hausmann (2):
32139 fast-import: Fix uninitialized variable
32140 fast-import: Fix crash when referencing already existing objects
32142 Steffen Prohaska (1):
32143 user-manual: fixed typo in example
32145 Stephan Springl (1):
32146 Use git-for-each-ref to check whether the origin branch exists.
32148 Sven Verdoolaege (1):
32149 unpack-trees.c: verify_uptodate: remove dead code
32152 Version v1.5.2; changes since v1.5.2-rc3:
32153 -----------------------------------------
32156 Allow fetching references from any namespace
32159 Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
32160 Fix crlf attribute handling to match documentation
32162 Andy Whitcroft (1):
32163 git name-rev writes beyond the end of malloc() with large generations
32166 git-svn: don't drop the username from URLs when dcommit is run
32167 git-svn: clean up caching of SVN::Ra functions
32168 git-svn: fix segfaults due to initial SVN pool being cleared
32169 git-svn: don't attempt to minimize URLs by default
32170 git-svn: avoid crashing svnserve when creating new directories
32171 git-svn: don't minimize-url when doing an init that tracks multiple paths
32173 Frank Lichtenheld (5):
32174 cvsserver: Limit config parser to needed options
32175 cvsserver: Don't send mixed messages to clients
32176 builtin-log.c: Fix typo in comment
32177 Documentation: format-patch has no --mbox option
32178 git-am: Clean up the asciidoc documentation
32180 J. Bruce Fields (14):
32181 user-manual: revise birdseye-view chapter
32182 glossary: expand and clarify some definitions, prune cross-references
32183 user-manual: move quick-start to an appendix
32184 Documentation: remove howto's now incorporated into manual
32185 user-manual: move howto/make-dist.txt into user manual
32186 user-manual: move howto/using-topic-branches into manual
32187 user-manual: add a "counting commits" example
32188 user-manual: introduce git
32189 user-manual: listing commits reachable from some refs not others
32190 user-manual: reorganize public git repo discussion
32191 tutorials: add user-manual links
32192 tutorial: revise index introduction
32193 user-manual: discourage shared repository
32194 user-manual: finding commits referencing given file content
32196 Jakub Narębski (10):
32197 gitweb: Test if $from_id and $to_id are defined before comparison
32198 gitweb: Check if requested object exists
32199 gitweb: Fix "Use of unitialized value" warnings in empty repository
32200 Documentation: Split description of pretty formats of commit log
32201 gitweb: Add a few comments about %feature hash
32202 gitweb: Do not use absolute font sizes
32203 gitweb: Separate search regexp from search text
32204 gitweb: Empty patch for merge means trivial merge, not no differences
32205 gitweb: Fix error in git_patchset_body for deletion in merge commit
32206 gitweb: Fix "Use of uninitialized value" warning in git_feed
32209 Updated documentation of hooks in git-receive-pack.
32210 Minor fixup to documentation of hooks in git-receive-pack.
32213 git-add: allow path limiting with -u
32214 Documentation/git-add: clarify -u with path limiting
32215 format-patch: add MIME-Version header when we add content-type.
32218 Fix signedness on return value from xread()
32219 Ensure return value from xread() is always stored into an ssize_t
32220 user-manual: Add section on ignoring files
32222 Johannes Schindelin (2):
32223 import-tars: Use the "Link indicator" to identify directories
32224 Add a birdview-on-the-source-code section to the user manual
32226 Junio C Hamano (17):
32227 Minor copyediting on Release Notes for 1.5.2
32228 Add has_symlink_leading_path() function.
32229 apply: do not get confused by symlinks in the middle
32230 read-tree -m -u: avoid getting confused by intermediate symlinks.
32231 t9400: Use the repository config and nothing else.
32232 checkout: allow detaching to HEAD even when switching to the tip of a branch
32233 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
32234 Link to HTML version of external doc if available
32235 Fix git-clone buglet for remote case.
32236 Prepare for 1.5.1.5 Release Notes
32237 gitweb: fix another use of undefined value
32239 Add link to 1.5.1.5 release notes.
32240 Documentation/git.txt: Update links to older documentation pages.
32242 git-cvsserver: exit with 1 upon "I HATE YOU"
32246 git-archive: don't die when repository uses subprojects
32248 Marco Costalba (1):
32249 Fix an unmatched comment end in arm/sha1_arm.S
32251 Matthias Kestenholz (2):
32252 Documentation: Added [verse] to SYNOPSIS where necessary
32253 Documentation: Reformatted SYNOPSIS for several commands
32255 Matthieu Castet (1):
32256 Remove stale non-static-inline prototype for tree_entry_extract()
32258 Michael Hendricks (2):
32259 git-send-email: allow leading white space on mutt aliases
32260 Document core.excludesfile for git-add
32263 gitweb: Normalize searchbar font size
32264 gitweb: Add support for grep searches
32265 gitweb: Allow arbitrary strings to be dug with pickaxe
32266 Documentation: git-rev-list's "patterns"
32267 gitweb: Remove redundant $searchtype setup
32270 RPM spec: include files in technical/ to package.
32271 Documentation/branch: fix small typo in -D example
32274 git-archive: convert archive entries like checkouts do
32276 Shawn O. Pearce (1):
32277 git-gui: Gracefully handle bad TCL_PATH at compile time
32279 Steffen Prohaska (4):
32280 tiny fix in documentation of git-clone
32281 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
32282 Optimized cvsexportcommit: calling 'cvs status' once instead of once per touched file.
32283 Fixed link in user-manual
32286 Version v1.5.2-rc3; changes since v1.5.2-rc2:
32287 ---------------------------------------------
32290 Use GIT_OBJECT_DIR for temporary files of pack-objects
32292 Amos Waterland (1):
32293 wcwidth redeclaration
32295 Frank Lichtenheld (1):
32296 cvsserver: Add test cases for git-cvsserver
32299 gitweb: choose appropriate view for file type if a= parameter missing
32301 J. Bruce Fields (7):
32302 user-manual: more discussion of detached heads, fix typos
32303 user-manual: add section ID's
32304 user-manual: clean up fast-forward and dangling-objects sections
32305 user-manual: fix .gitconfig editing examples
32306 user-manual: miscellaneous editing
32307 user-manual: stop deprecating the manual
32308 user-manual: fix clone and fetch typos
32310 Jakub Narębski (6):
32311 gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
32312 gitweb: Add combined diff support to git_difftree_body
32313 gitweb: Add combined diff support to git_patchset_body
32314 gitweb: Make it possible to use pre-parsed info in git_difftree_body
32315 gitweb: Show combined diff for merge commits in 'commitdiff' view
32316 gitweb: Show combined diff for merge commits in 'commit' view
32319 SPECIFYING RANGES typo fix: it it => it is
32322 Documentation: don't reference non-existent 'git-cvsapplycommit'
32325 git-gui: Call changes "Staged" and "Unstaged" in file list titles.
32327 Junio C Hamano (10):
32328 diff: release blobs after generating textual diff.
32329 diff.c: do not use a separate "size cache".
32330 diff -M: release the preimage candidate blobs after rename detection.
32331 diff -S: release the image after looking for needle in it
32333 Update documentation links to point at 1.5.1.4
32334 t9400: skip cvsserver test if Perl SQLite interface is unavailable
32335 git-clone: don't get fooled by $PWD
32336 .mailmap: add some aliases
32340 Document git add -u introduced earlier.
32341 Added a reference to git-add in the documentation for git-update-index
32343 Michael Hendricks (1):
32344 Document 'git-log --decorate'
32347 dir.c: Omit non-excluded directories with dir->show_ignored
32348 t7300: Basic tests for git-clean
32349 Fix minor documentation errors
32351 Paul Mackerras (1):
32352 gitk: Allow user to choose whether to see the diff, old file, or new file
32355 Git.pm: config_boolean() -> config_bool()
32356 gitweb: Do not use absolute font sizes
32359 Add howto files to rpm packages.
32360 Added new git-gui library files to rpm spec
32362 Richard P. Curnow (2):
32363 Fix documentation of tag in git-fast-import.txt
32364 Fix documentation of tag in git-fast-import.txt
32366 Shawn O. Pearce (32):
32367 git-gui: Correctly handle UTF-8 encoded commit messages
32368 git-gui: Allow spaces in path to 'wish'
32369 git-gui: Include the subject in the status bar after commit
32370 git-gui: Warn users before making an octopus merge
32371 git-gui: Correct line wrapping for too many branch message
32372 git-gui: Cleanup common font handling for font_ui
32373 git-gui: Use option database defaults to set the font
32374 git-gui: Refactor to use our git proc more often
32375 git-gui: Track our own embedded values and rebuild when they change
32376 Properly handle '0' filenames in import-tars
32377 git-gui: Refactor into multiple files to save my sanity
32378 git-gui: Move console procs into their own namespace
32379 git-gui: Allow vi keys to scroll the diff/blame regions
32380 git-gui: Move merge support into a namespace
32381 git-gui: Show all possible branches for merge
32382 git-gui: Include commit id/subject in merge choices
32383 git-gui: Use vi-like keys in merge dialog
32384 Remove duplicate exports from Makefile
32385 git-gui: Allow shift-{k,j} to select a range of branches to merge
32386 git-gui: Define a simple class/method system
32387 git-gui: Convert browser, console to "class" format
32388 git-gui: Don't attempt to inline array reads in methods
32389 git-gui: Convert blame to the "class" way of doing things
32390 git-gui: Use prefix if blame is run in a subdirectory
32391 git-gui: Smarter command line parsing for browser, blame
32392 git-gui: Generate blame on uncommitted working tree file
32393 git-gui: Cleanup minor nits in blame code
32394 git-gui: Format author/committer times in ISO format
32395 Use .git/MERGE_MSG in cherry-pick/revert
32396 git-gui: Paperbag fix blame in subdirectory
32398 Correct error message in revert/cherry-pick
32401 Add pack.depth option to git-pack-objects.
32402 Increase pack.depth default to 50
32405 Version v1.5.2-rc2; changes since v1.5.2-rc1:
32406 ---------------------------------------------
32409 Small correction in reading of commit headers
32410 Handle return code of parse_commit in revision machinery
32412 Alexandre Julliard (1):
32413 http-fetch: Disable use of curl multi support for libcurl < 7.16.
32415 Arjen Laarhoven (1):
32416 Document 'opendiff' value in config.txt and git-mergetool.txt
32419 Allow PERL_PATH="/usr/bin/env perl"
32420 posix compatibility for t4200
32423 Mention version 1.5.1 in tutorial and user-manual
32426 Create pack-write.c for common pack writing code
32428 Daniel Barkalow (1):
32429 Make xstrndup common
32431 Frank Lichtenheld (1):
32432 cvsserver: Handle re-added files correctly
32434 Jakub Narębski (1):
32435 diff format documentation: describe raw combined diff format
32438 Documentation: fix typo in git-remote.txt
32440 Johannes Schindelin (1):
32441 Teach import-tars about GNU tar's @LongLink extension.
32444 git-tag(1): -v option is a subcommand; fix code block
32446 Junio C Hamano (6):
32447 blame: use .mailmap unconditionally
32448 diff.c: fix "size cache" handling.
32449 blame: Notice a wholesale incorporation of an existing file.
32451 Add test for blame corner cases.
32455 Fix markup in git-svn man page
32456 Add --no-rebase option to git-svn dcommit
32458 Linus Torvalds (1):
32459 Fix --boundary output
32461 Martin Koegler (1):
32462 Fix compilation of test-delta
32464 Shawn O. Pearce (3):
32465 Reuse fixup_pack_header_footer in index-pack
32466 Don't use seq in tests, not everyone has it
32467 Improve request-pull to handle non-rebased branches
32470 gitweb: use decode_utf8 directly
32473 Version v1.5.2-rc1; changes since v1.5.2-rc0:
32474 ---------------------------------------------
32477 Remove usernames from all commit messages, not just when using svmprops
32478 git-svn: Don't rely on $_ after making a function call
32479 git-svn: Ignore usernames in URLs in find_by_url
32480 git-svn: Added 'find-rev' command
32481 git-svn: Add 'find-rev' command
32484 Fix handle leak in write_tree
32485 Avoid excessive rewrites in merge-recursive
32486 Add a test for merging changed and rename-changed branches
32487 Ignore merged status of the file-level merge
32488 Use strlcpy instead of strncpy in mailmap.c
32489 Fix read_mailmap to handle a caller uninterested in repo abbreviation
32490 Remove pointless calls to access(2) when checking for .mailmap
32491 Include mailmap.h in mailmap.c to catch mailmap interface changes
32494 Removing -n option from git-diff-files documentation
32495 Document additional options for git-fetch
32496 Update git-fmt-merge documentation
32497 Update git-grep documentation
32498 Update -L documentation for git-blame/git-annotate
32499 Update git-http-push documentation
32500 Update git-local-fetch documentation
32501 Update git-http-fetch documentation
32504 post-receive-email example hook: fastforward should have been fast_forward
32505 post-receive-email example hook: detect rewind-only updates and output sensible message
32506 post-receive-email example hook: sed command for getting description was wrong
32508 Brian Gernhardt (2):
32509 Reverse the order of -b and --track in the man page.
32510 Ignore all man sections as they are generated files.
32513 Documentation/git-reset.txt: suggest git commit --amend in example.
32516 Clarify SubmittingPatches Checklist
32517 git.7: Mention preformatted html doc location
32518 send-email documentation: clarify --smtp-server
32520 Johannes Schindelin (3):
32521 dir.c(common_prefix): Fix two bugs
32522 t4201: Do not display weird characters on the terminal
32523 import-tars: be nice to wrong directory modes
32526 Add clean.requireForce option, and add -f option to git-clean to override it
32527 Fix typo in git-am: s/Was is/Was it/
32528 Create a sysconfdir variable, and use it for ETC_GITCONFIG
32529 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
32530 Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL
32532 Julian Phillips (1):
32533 http.c: Fix problem with repeated calls of http_init
32535 Junio C Hamano (25):
32536 Move index-related variables into a structure.
32537 Make read-cache.c "the_index" free.
32538 Document "diff=driver" attribute
32539 t5302: avoid using tail -c
32540 t6030: grab commit object name as we go
32541 Build RPM with ETC_GITCONFIG=/etc/gitconfig
32542 Diff between two blobs should take mode changes into account now.
32543 t/test-lib.sh: Protect ourselves from common misconfiguration that exports CDPATH to the environment
32544 gitattributes documentation: clarify overriding
32545 applymbox & quiltimport: typofix.
32546 Add 'ident' conversion.
32547 Add 'filter' attribute and external filter driver definition.
32548 Add --date={local,relative,default}
32549 Start preparing for 1.5.1.3
32550 Do not barf on too long action description
32551 Update .mailmap with "Michael"
32552 Fix import-tars fix.
32553 blame -s: suppress author name and time.
32554 Split out mailmap handling out of shortlog
32555 Apply mailmap in git-blame output.
32556 Make macros to prevent double-inclusion in headers consistent.
32557 Make sure test-genrandom and test-chmtime are builtas part of the main build.
32558 Fix symlink handling in git-svn, related to PerlIO
32562 Luiz Fernando N. Capitulino (5):
32563 remove_subtree(): Use strerror() when possible
32564 entry.c: Use const qualifier for 'struct checkout' parameters
32565 read_cache_from(): small simplification
32566 core-tutorial: minor fixes
32567 init_buffer(): Kill buf pointer
32569 Martin Koegler (5):
32570 Add S_IFINVALID mode
32571 add get_sha1_with_mode
32572 add add_object_array_with_mode
32573 store mode in rev_list, if <tree>:<filename> syntax is used
32574 use mode of the tree in git-diff, if <tree>:<file> syntax is used
32576 Michele Ballabio (1):
32577 git shortlog documentation: add long options and fix a typo
32580 add file checkout progress
32582 OGAWA Hirofumi (1):
32583 git-fetch: Fix "argument list too long"
32585 Robin H. Johnson (10):
32586 Document --dry-run parameter to send-email.
32587 Prefix Dry- to the message status to denote dry-runs.
32588 Debugging cleanup improvements
32589 Change the scope of the $cc variable as it is not needed outside of send_message.
32590 Perform correct quoting of recipient names.
32591 Validate @recipients before using it for sendmail and Net::SMTP.
32592 Ensure clean addresses are always used with Net::SMTP
32593 Allow users to optionally specify their envelope sender.
32594 Document --dry-run and envelope-sender for git-send-email.
32595 Sanitize @to recipients.
32598 fast-import: size_t vs ssize_t
32600 Shawn O. Pearce (4):
32601 Don't repack existing objects in fast-import
32602 Actually handle some-low memory conditions
32603 Don't allow empty pathnames in fast-import
32604 Catch empty pathnames in trees during fsck
32606 Uwe Kleine-König (1):
32607 fix importing of subversion tars
32610 Version v1.5.2-rc0; changes since v1.5.1.6:
32611 -------------------------------------------
32614 Fix passing of TCLTK_PATH to git-gui
32615 Fix t4201: accidental arithmetic expansion
32616 Fix permissions on test scripts
32617 Tests for core subproject support
32618 Simplify calling of CR/LF conversion routines
32619 Fix a typo in crlf conversion code
32620 Fix crash in t0020 (crlf conversion)
32622 Alexandre Julliard (1):
32623 git.el: Add a commit description to the reflog.
32626 Add policy on user-interface changes
32629 Show binary file size change in diff --stat
32631 Aneesh Kumar K.V (1):
32632 gitview: annotation support
32634 Brian Gernhardt (2):
32635 Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
32636 Remove case-sensitive file in t3030-merge-recursive.
32638 Christian Couder (4):
32639 Bisect: teach "bisect start" to optionally use one bad and many good revs.
32640 Documentation: bisect: "start" accepts one bad and many good commits
32641 Bisect: simplify "bisect start" logging.
32642 Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".
32645 git-svn: bail out on incorrect command-line options
32647 Eygene Ryabinkin (11):
32648 Add the WITH_P4IMPORT knob to the Makefile.
32649 Added git-p4 package to the list of git RPMs.
32650 Added correct Python path to the RPM specfile.
32652 Add --with-tcltk and --without-tcltk to configure.
32653 Rewrite Tcl/Tk interpreter path for the GUI tools.
32654 Eliminate checks of user-specified Tcl/Tk interpreter.
32655 Allow wish interpreter to be defined with TCLTK_PATH
32656 Teach git-gui to use the user-defined UI font everywhere.
32657 Improve look-and-feel of the git-gui tool.
32658 Do not break git-gui messages into multiple lines.
32660 Fernando J. Pereda (1):
32661 Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
32663 Frank Lichtenheld (16):
32664 cvsserver: Introduce new state variable 'method'
32665 cvsserver: Handle three part keys in git config correctly
32666 cvsserver: Allow to override the configuration per access method
32667 cvsserver: Make the database backend configurable
32668 cvsserver: Abort if connect to database fails
32669 Documentation: Replace @@GIT_VERSION@@ in documentation
32670 Documentation: Add version information to man pages
32671 cvsserver: Use DBI->table_info instead of DBI->tables
32672 cvsserver: Corrections to the database backend configuration
32673 cvsserver: Add asciidoc documentation for new database backend configuration
32674 gitweb: Allow forks with project list file
32675 gitweb: Allow configuring the default projects order and add order 'none'
32676 cvsserver: Allow to "add" a removed file
32677 cvsserver: Reword documentation on necessity of write access
32678 cvsserver: Document the GIT branches -> CVS modules mapping more prominently
32679 config.txt: Add gitcvs.db* variables
32681 Jakub Narębski (2):
32682 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)
32683 gitweb: Quote hash keys, and do not use barewords keys
32686 Document git-check-attr
32689 sscanf/strtoul: parse integers robustly
32691 Johannes Schindelin (1):
32692 Use print_wrapped_text() in shortlog
32694 Julian Phillips (1):
32695 refs.c: add a function to sort a ref list, rather then sorting on add
32697 Junio C Hamano (83):
32698 git-fetch: add --quiet
32699 t6002: minor spelling fix.
32700 git-rev-list: add --bisect-vars option.
32701 git-rev-list --bisect: optimization
32702 t6004: add a bit more path optimization test.
32703 rev-list --bisect: Fix "halfway" optimization.
32704 make the previous optimization work also on path-limited rev-list --bisect
32705 Documentation: unbreak user-manual.
32706 Optional Tck/Tk: ignore generated files.
32707 checkout: allow detaching to HEAD even when switching to the tip of a branch
32708 _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
32709 git-read-tree --index-output=<file>
32710 add_cache_entry(): removal of file foo does not conflict with foo/bar
32711 unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
32712 unpack-trees: get rid of *indpos parameter.
32713 Fix read-tree --prefix=dir/.
32714 Fix twoway_merge that passed d/f conflict marker to merged_entry().
32715 Fix switching to a branch with D/F when current branch has file D.
32716 RPM spec: include git-p4 in the list of all packages.
32717 Fix bogus error message from merge-recursive error path
32718 Propagate cache error internal to refresh_cache() via parameter.
32719 Rename internal function "add_file_to_cache" in builtin-update-index.c
32720 Rename static variable write_index to update_index in builtin-apply.c
32721 Rename add_file_to_index() to add_file_to_cache()
32722 git-bisect: modernization
32723 t6030: add a bit more tests to git-bisect
32724 git-bisect: allow bisecting with only one bad commit.
32725 git-push reports the URL after failing.
32726 git-push to multiple locations does not stop at the first failure
32727 A new merge stragety 'subtree'.
32728 Start 1.5.2 cycle by prepareing RelNotes for it.
32729 shortlog -w: make wrap-line behaviour optional.
32730 t1000: fix case table.
32731 Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
32732 merge-recursive: do not barf on "to be removed" entries.
32733 merge-recursive: handle D/F conflict case more carefully.
32734 t3030: merge-recursive backend test.
32735 git-fetch--tool pick-rref
32736 git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
32737 Add %m to '--pretty=format:'
32738 Refactor patch-id filtering out of git-cherry and git-format-patch.
32739 git-log --cherry-pick A...B
32740 Documentation: --cherry-pick
32741 Fix git {log,show,...} --pretty=email
32742 Add basic infrastructure to assign attributes to paths
32743 Define 'crlf' attribute.
32744 Teach 'diff' about 'diff' attribute.
32745 Fix 'crlf' attribute semantics.
32746 Fix 'diff' attribute semantics.
32747 Makefile: add patch-ids.h back in.
32748 attribute macro support
32749 Define a built-in attribute macro "binary".
32750 Change attribute negation marker from '!' to '-'.
32751 send-email: do not leave an empty CC: line if no cc is present.
32752 Make sure quickfetch is not fooled with a previous, incomplete fetch.
32753 Allow more than true/false to attributes.
32754 merge-recursive: separate out xdl_merge() interface.
32755 git-gui: Honor TCLTK_PATH if supplied
32756 Allow specifying specialized merge-backend per path.
32757 Add a demonstration/test of customized merge.
32758 Update draft release notes for 1.5.2 with accumulated changes.
32759 Custom low-level merge driver support.
32760 Allow the default low-level merge driver to be configured.
32761 Custom low-level merge driver: change the configuration scheme.
32762 Allow low-level driver to specify different behaviour during internal merge.
32763 Fix funny types used in attribute value representation
32764 Counto-fix in merge-recursive
32765 Simplify code to find recursive merge driver.
32766 Documentation: support manual section (5) - file formats.
32767 Update 'crlf' attribute semantics.
32768 Document gitattributes(5)
32769 git-add -u: match the index with working tree.
32770 Fix bogus linked-list management for user defined merge drivers.
32771 convert.c: restructure the attribute checking part.
32772 lockfile: record the primary process.
32773 Update documentation links to point at v1.5.1.2
32774 Documentation/Makefile: fix section (5) installation
32775 Update draft release notes for v1.5.2
32776 pack-objects: quickfix for permission modes.
32777 Fix 'quickfix' on pack-objects.
32778 Update tests not to assume that generated packfiles are writable.
32779 pack-objects: make generated packfile read-only
32780 Support 'diff=pgm' attribute
32782 Linus Torvalds (24):
32783 Optimize directory listing with pathspec limiter.
32784 diff-lib: use ce_mode_from_stat() rather than messing with modes manually
32785 Avoid overflowing name buffer in deep directory structures
32786 Add 'resolve_gitlink_ref()' helper function
32787 Add "S_IFDIRLNK" file mode infrastructure for git links
32788 Teach "fsck" not to follow subproject links
32789 Teach core object handling functions about gitlinks
32790 Fix thinko in subproject entry sorting
32791 Teach directory traversal about subprojects
32792 Teach git-update-index about gitlinks
32793 Don't show gitlink directories when we want "other" files
32794 Teach git list-objects logic not to follow gitlinks
32795 Teach "git-read-tree -u" to check out submodules as a directory
32796 Fix gitlink index entry filesystem matching
32797 Teach git list-objects logic to not follow gitlinks
32798 Teach "git-read-tree -u" to check out submodules as a directory
32799 Fix some "git ls-files -o" fallout from gitlinks
32800 Expose subprojects as special files to "git diff" machinery
32801 Add a generic "object decorator" interface, and make object refs use it
32802 Add support for "commit name decorations" to log family of commands
32803 Use proper object allocators for unknown object nodes too
32804 Clean up object creation to use more common code
32805 Fix working directory errno handling when unlinking a directory
32806 Fix a copy-n-paste bug in the object decorator code.
32808 Luiz Fernando N. Capitulino (2):
32809 ident.c: Use const qualifier for 'struct passwd' parameters
32810 ident.c: Use size_t (instead of int) to store sizes
32812 Martin Koegler (1):
32813 gitweb: Show "no difference" message for empty diff
32815 Michael S. Tsirkin (1):
32816 Display the subject of the commit just made.
32818 Nicolas Pitre (32):
32819 clean up and optimize nth_packed_object_sha1() usage
32820 get rid of num_packed_objects()
32821 make overflow test on delta base offset work regardless of variable size
32822 add overflow tests on pack offset variables
32823 compute a CRC32 for each object as stored in a pack
32824 compute object CRC32 with index-pack
32825 pack-objects: learn about pack index version 2
32826 index-pack: learn about pack index version 2
32827 sha1_file.c: learn about index version 2
32828 show-index.c: learn about index v2
32829 pack-redundant.c: learn about index v2
32830 allow forcing index v2 and 64-bit offset treshold
32831 validate reused pack data with CRC when possible
32832 simple random data generator for tests
32833 use test-genrandom in tests instead of /dev/urandom
32834 tests for various pack index features
32835 clean up add_object_entry()
32836 pack-objects: optimize preferred base handling a bit
32837 pack-objects: equal objects in size should delta against newer objects
32838 pack-objects: rework check_delta_limit usage
32839 pack-objects: clean up list sorting
32840 pack-objects: get rid of reuse_cached_pack
32841 pack-objects: get rid of create_final_object_list()
32842 pack-objects: make in_pack_header_size a variable of its own
32843 add get_size_from_delta()
32844 pack-objects: better check_object() performances
32845 pack-objects: remove obsolete comments
32846 document --index-version for index-pack and pack-objects
32847 common progress display support
32848 make progress "title" part of the common progress interface
32849 provide a facility for "delayed" progress reporting
32850 delay progress display when checking out files
32853 git-archive: make tar the default format
32855 Robin H. Johnson (2):
32856 Add custom subject prefix support to format-patch (take 3)
32857 Add testcase for format-patch --subject-prefix (take 3)
32859 Shawn O. Pearce (8):
32860 Always bind the return key to the default button
32861 Fix lost-found to show commits only referenced by reflogs
32862 Don't yap about merge-subtree during make
32863 git-gui: Display the directory basename in the title
32864 Revert "Allow wish interpreter to be defined with TCLTK_PATH"
32865 Contribute a fairly paranoid update hook
32866 Kill the useless progress meter in merge-recursive
32867 Cleanup variables in cat-file
32870 Add --quiet option to suppress output of "rm" commands for removed files.
32871 git-rm: Trivial fix for a comment typo.
32872 Add --ignore-unmatch option to exit with zero status when no files are removed.
32874 Xavier Maillard (2):
32875 git-blame.el: separate git-blame-mode to ease maintenance
32876 git-blame.el: pick a set of random colors for each git-blame turn
32879 Version v1.5.1.6; changes since v1.5.1.5:
32880 -----------------------------------------
32883 git-svn: avoid crashing svnserve when creating new directories
32884 git-svn: don't minimize-url when doing an init that tracks multiple paths
32886 J. Bruce Fields (4):
32887 tutorials: add user-manual links
32888 tutorial: revise index introduction
32889 user-manual: discourage shared repository
32890 user-manual: finding commits referencing given file content
32893 user-manual: Add section on ignoring files
32895 Junio C Hamano (1):
32898 Matthias Kestenholz (2):
32899 Documentation: Added [verse] to SYNOPSIS where necessary
32900 Documentation: Reformatted SYNOPSIS for several commands
32903 Version v1.5.1.5; changes since v1.5.1.4:
32904 -----------------------------------------
32907 Allow fetching references from any namespace
32909 Andy Whitcroft (1):
32910 git name-rev writes beyond the end of malloc() with large generations
32913 git-svn: don't drop the username from URLs when dcommit is run
32914 git-svn: clean up caching of SVN::Ra functions
32915 git-svn: fix segfaults due to initial SVN pool being cleared
32916 git-svn: don't attempt to minimize URLs by default
32918 Frank Lichtenheld (3):
32919 builtin-log.c: Fix typo in comment
32920 Documentation: format-patch has no --mbox option
32921 git-am: Clean up the asciidoc documentation
32923 J. Bruce Fields (10):
32924 user-manual: revise birdseye-view chapter
32925 glossary: expand and clarify some definitions, prune cross-references
32926 user-manual: move quick-start to an appendix
32927 Documentation: remove howto's now incorporated into manual
32928 user-manual: move howto/make-dist.txt into user manual
32929 user-manual: move howto/using-topic-branches into manual
32930 user-manual: add a "counting commits" example
32931 user-manual: introduce git
32932 user-manual: listing commits reachable from some refs not others
32933 user-manual: reorganize public git repo discussion
32935 Jakub Narębski (1):
32936 gitweb: Add a few comments about %feature hash
32939 Updated documentation of hooks in git-receive-pack.
32942 SPECIFYING RANGES typo fix: it it => it is
32945 format-patch: add MIME-Version header when we add content-type.
32947 Johannes Schindelin (2):
32948 import-tars: Use the "Link indicator" to identify directories
32949 Add a birdview-on-the-source-code section to the user manual
32951 Junio C Hamano (7):
32952 git-clone: don't get fooled by $PWD
32953 .mailmap: add some aliases
32954 checkout: allow detaching to HEAD even when switching to the tip of a branch
32955 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
32956 Fix git-clone buglet for remote case.
32957 Prepare for 1.5.1.5 Release Notes
32960 Marco Costalba (1):
32961 Fix an unmatched comment end in arm/sha1_arm.S
32963 Matthieu Castet (1):
32964 Remove stale non-static-inline prototype for tree_entry_extract()
32966 Michael Hendricks (2):
32967 git-send-email: allow leading white space on mutt aliases
32968 Document core.excludesfile for git-add
32971 Documentation: git-rev-list's "patterns"
32974 RPM spec: include files in technical/ to package.
32975 Documentation/branch: fix small typo in -D example
32977 Richard P. Curnow (2):
32978 Fix documentation of tag in git-fast-import.txt
32979 Fix documentation of tag in git-fast-import.txt
32981 Shawn O. Pearce (1):
32982 Properly handle '0' filenames in import-tars
32984 Steffen Prohaska (3):
32985 tiny fix in documentation of git-clone
32986 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
32987 Fixed link in user-manual
32990 Version v1.5.1.4; changes since v1.5.1.3:
32991 -----------------------------------------
32994 Small correction in reading of commit headers
32996 Alexandre Julliard (1):
32997 http-fetch: Disable use of curl multi support for libcurl < 7.16.
32999 Amos Waterland (1):
33000 wcwidth redeclaration
33002 Arjen Laarhoven (1):
33003 Document 'opendiff' value in config.txt and git-mergetool.txt
33006 Allow PERL_PATH="/usr/bin/env perl"
33007 posix compatibility for t4200
33010 Mention version 1.5.1 in tutorial and user-manual
33012 Daniel Barkalow (1):
33013 Make xstrndup common
33015 Frank Lichtenheld (1):
33016 cvsserver: Handle re-added files correctly
33018 J. Bruce Fields (7):
33019 user-manual: more discussion of detached heads, fix typos
33020 user-manual: add section ID's
33021 user-manual: clean up fast-forward and dangling-objects sections
33022 user-manual: fix .gitconfig editing examples
33023 user-manual: miscellaneous editing
33024 user-manual: stop deprecating the manual
33025 user-manual: fix clone and fetch typos
33027 Jakub Narębski (1):
33028 diff format documentation: describe raw combined diff format
33031 Documentation: fix typo in git-remote.txt
33034 Documentation: don't reference non-existent 'git-cvsapplycommit'
33036 Johannes Schindelin (1):
33037 Teach import-tars about GNU tar's @LongLink extension.
33039 Junio C Hamano (5):
33040 diff.c: fix "size cache" handling.
33041 blame: Notice a wholesale incorporation of an existing file.
33043 Add test for blame corner cases.
33047 Fix markup in git-svn man page
33048 Add --no-rebase option to git-svn dcommit
33050 Linus Torvalds (1):
33051 Fix --boundary output
33053 Martin Koegler (1):
33054 Fix compilation of test-delta
33056 Paul Mackerras (1):
33057 gitk: Allow user to choose whether to see the diff, old file, or new file
33060 Add howto files to rpm packages.
33062 Shawn O. Pearce (1):
33063 git-gui: Allow spaces in path to 'wish'
33066 gitweb: use decode_utf8 directly
33069 Version v1.5.1.3; changes since v1.5.1.2:
33070 -----------------------------------------
33073 Remove usernames from all commit messages, not just when using svmprops
33074 git-svn: Don't rely on $_ after making a function call
33075 git-svn: Ignore usernames in URLs in find_by_url
33076 git-svn: Added 'find-rev' command
33077 git-svn: Add 'find-rev' command
33080 Fix handle leak in write_tree
33083 Removing -n option from git-diff-files documentation
33084 Document additional options for git-fetch
33085 Update git-fmt-merge documentation
33086 Update git-grep documentation
33087 Update -L documentation for git-blame/git-annotate
33088 Update git-http-push documentation
33089 Update git-local-fetch documentation
33090 Update git-http-fetch documentation
33092 Brian Gernhardt (2):
33093 Reverse the order of -b and --track in the man page.
33094 Ignore all man sections as they are generated files.
33097 Documentation/git-reset.txt: suggest git commit --amend in example.
33100 Clarify SubmittingPatches Checklist
33101 git.7: Mention preformatted html doc location
33102 send-email documentation: clarify --smtp-server
33104 Johannes Schindelin (2):
33105 dir.c(common_prefix): Fix two bugs
33106 import-tars: be nice to wrong directory modes
33109 Fix typo in git-am: s/Was is/Was it/
33110 Create a sysconfdir variable, and use it for ETC_GITCONFIG
33111 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
33113 Julian Phillips (1):
33114 http.c: Fix problem with repeated calls of http_init
33116 Junio C Hamano (8):
33117 Build RPM with ETC_GITCONFIG=/etc/gitconfig
33118 applymbox & quiltimport: typofix.
33119 Start preparing for 1.5.1.3
33120 Do not barf on too long action description
33121 Update .mailmap with "Michael"
33122 Fix import-tars fix.
33123 Fix symlink handling in git-svn, related to PerlIO
33126 Michele Ballabio (1):
33127 git shortlog documentation: add long options and fix a typo
33129 Robin H. Johnson (10):
33130 Document --dry-run parameter to send-email.
33131 Prefix Dry- to the message status to denote dry-runs.
33132 Debugging cleanup improvements
33133 Change the scope of the $cc variable as it is not needed outside of send_message.
33134 Perform correct quoting of recipient names.
33135 Validate @recipients before using it for sendmail and Net::SMTP.
33136 Ensure clean addresses are always used with Net::SMTP
33137 Allow users to optionally specify their envelope sender.
33138 Document --dry-run and envelope-sender for git-send-email.
33139 Sanitize @to recipients.
33141 Shawn O. Pearce (3):
33142 Actually handle some-low memory conditions
33143 Don't allow empty pathnames in fast-import
33144 Catch empty pathnames in trees during fsck
33147 Version v1.5.1.2; changes since v1.5.1.1:
33148 -----------------------------------------
33151 Use rev-list --reverse in git-rebase.sh
33152 Document -g (--walk-reflogs) option of git-log
33153 Fix overwriting of files when applying contextually independent diffs
33156 Update git-am documentation
33157 Update git-applymbox documentation
33158 Update git-apply documentation
33159 Update git-annotate/git-blame documentation
33160 Update git-archive documentation
33161 Update git-cherry-pick documentation
33162 Fix unmatched emphasis tag in git-tutorial
33163 Update git-config documentation
33165 Andy Whitcroft (1):
33166 fix up strtoul_ui error handling
33169 Use const qualifier for 'sha1' parameter in delete_ref function
33172 git-svn: respect lower bound of -r/--revision when following parent
33173 git-svn: quiet some warnings when run only with --version/--help
33174 git-svn: don't allow globs to match regular files
33175 perl: install private Error.pm if the site version is older than our own
33177 Eygene Ryabinkin (2):
33178 Teach gitk to use the user-defined UI font everywhere.
33179 Improve look-and-feel of the gitk tool.
33181 Frank Lichtenheld (5):
33182 config.txt: Document gitcvs.allbinary
33183 config.txt: Document core.autocrlf
33184 config.txt: Change pserver to server in description of gitcvs.*
33185 config.txt: Fix grammatical error in description of http.noEPSV
33186 git-shortlog: Fix two formatting errors in asciidoc documentation
33189 variable $projectdesc needs to be set before checking against unchanged default.
33190 Have sample update hook not refuse deleting a branch through push.
33192 J. Bruce Fields (7):
33193 Documentation: minor edits of git-lost-found manpage
33194 Documentation: clarify git-checkout -f, minor editing
33195 Documentation: clarify track/no-track option.
33196 user-manual: fix discussion of default clone
33197 user-manual: detached HEAD
33198 user-manual: start revising "internals" chapter
33199 user-manual: use detached head when rewriting history
33202 sscanf/strtoul: parse integers robustly
33204 Junio C Hamano (4):
33205 Do not default to --no-index when given two directories.
33206 Start preparing for 1.5.1.2
33207 git-clone: fix dumb protocol transport to clone from pack-pruned ref
33210 Linus Torvalds (1):
33211 git-quiltimport complaining yet still working
33213 Matthias Lederhofer (1):
33214 handle_options in git wrapper miscounts the options it handled.
33217 git-blame: Fix overrun in fake_working_tree_commit()
33220 git-tar-tree: complete deprecation conversion message
33222 Shawn O. Pearce (1):
33223 git-gui: Brown paper bag fix division by 0 in blame
33226 Version v1.5.1.1; changes since v1.5.1:
33227 ---------------------------------------
33229 Arjen Laarhoven (4):
33230 usermanual.txt: some capitalization nits
33231 t3200-branch.sh: small language nit
33232 t5300-pack-object.sh: portability issue using /usr/bin/stat
33233 Makefile: iconv() on Darwin has the old interface
33235 Brian Gernhardt (3):
33236 Fix t4200-rerere for white-space from "wc -l"
33237 Document --left-right option to rev-list.
33238 Distinguish branches by more than case in tests.
33241 Fix lseek(2) calls with args 2 and 3 swapped
33244 git-svn: bail out on incorrect command-line options
33245 git-svn: dcommit/rebase confused by patches with git-svn-id: lines
33246 git-svn: fix log command to avoid infinite loop on long commit messages
33248 Frank Lichtenheld (7):
33249 cvsimport: sync usage lines with existing options
33250 cvsimport: Improve documentation of CVSROOT and CVS module determination
33251 cvsimport: Improve usage error reporting
33252 cvsimport: Reorder options in documentation for better understanding
33253 cvsimport: Improve formating consistency
33254 cvsserver: small corrections to asciidoc documentation
33255 cvsserver: Fix handling of diappeared files on update
33258 Fix renaming branch without config file
33261 rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
33263 Jakub Narębski (1):
33264 gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
33267 (encode_85, decode_85): Mark source buffer pointer as "const".
33269 Julian Phillips (1):
33270 Documentation: show-ref: document --exclude-existing
33272 Junio C Hamano (7):
33273 rerere: make sorting really stable.
33274 Fix dependency of common-cmds.h
33275 Documentation: tighten dependency for git.{html,txt}
33276 Prepare for 1.5.1.1
33277 Add Documentation/cmd-list.made to .gitignore
33278 fsck: do not complain on detached HEAD.
33282 rename_ref(): only print a warning when config-file update fails
33283 Make builtin-branch.c handle the git config file
33286 Revert "builtin-archive: use RUN_SETUP"
33288 Shawn O. Pearce (1):
33289 Honor -p<n> when applying git diffs
33291 Tomash Brechko (1):
33292 cvsexportcommit -p : fix the usage of git-apply -C.
33295 DESTDIR support for git/contrib/emacs
33297 YOSHIFUJI Hideaki (1):
33298 Avoid composing too long "References" header.
33301 Version v1.5.1; changes since v1.5.1-rc3:
33302 -----------------------------------------
33305 Keep rename/rename conflicts of intermediate merges while doing recursive merge
33308 Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email
33310 Christian Couder (1):
33311 Bisect: Improve error message in "bisect_next_check".
33314 git-mailinfo fixes for patch munging
33317 git-svn: avoid respewing similar error messages for missing paths
33318 git-svn: fail on rebase if we are unable to find a ref to rebase against
33321 git-quiltimport /bin/sh-ism fix
33323 Frank Lichtenheld (1):
33324 cvsserver: Don't lie about binary mode in asciidoc documentation
33327 Documentation/git-svnimport.txt: fix typo.
33328 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
33330 H. Peter Anvin (1):
33331 git-upload-pack: make sure we close unused pipe ends
33333 Jakub Narębski (2):
33334 gitweb: Support comparing blobs (files) with different names
33335 Documentation: A few minor fixes to Git User's Manual
33337 Julian Phillips (1):
33338 contrib/workdir: add a simple script to create a working directory
33340 Junio C Hamano (6):
33341 Update draft release notes for 1.5.1
33342 Do not bother documenting fetch--tool
33343 Hopefully final update to the draft Release Notes, preparing for 1.5.1
33344 rerere should not repeat the earlier hunks in later ones
33349 Plug memory leak in index-pack collision checking codepath.
33351 Theodore Ts'o (12):
33352 Fix minor formatting issue in man page for git-mergetool
33353 mergetool: Replace use of "echo -n" with printf(1) to be more portable
33354 mergetool: Don't error out in the merge case where the local file is deleted
33355 mergetool: portability fix: don't assume true is in /bin
33356 mergetool: portability fix: don't use reserved word function
33357 mergetool: factor out common code
33358 mergetool: Remove spurious error message if merge.tool config option not set
33359 mergetool: Fix abort command when resolving symlinks and deleted files
33360 mergetool: Add support for Apple Mac OS X's opendiff command
33361 mergetool: Make git-rm quiet when resolving a deleted file conflict
33362 mergetool: Clean up description of files and prompts for merge resolutions
33363 Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
33366 Version v1.5.1-rc3; changes since v1.5.1-rc2:
33367 ---------------------------------------------
33369 Alexandre Julliard (1):
33370 git.el: Display some information about the HEAD commit.
33372 Christian Couder (2):
33373 Bisect: Use "git-show-ref --verify" when reseting.
33374 Bisect: add checks at the beginning of "git bisect run".
33377 Makefile: remove test-chmtime program in target clean.
33378 http-fetch: don't use double-slash as directory separator in URLs
33379 http-fetch: remove path_len from struct alt_base, it was computed but never used
33381 H. Peter Anvin (1):
33382 git-upload-pack: make sure we close unused pipe ends
33384 Jakub Narębski (2):
33385 gitweb: Add example of config file and how to generate projects list to gitweb/INSTALL
33386 gitweb: Cleanup and uniquify die_error calls
33389 read-tree: use xcalloc
33390 use xrealloc in help.c
33393 git-rm: don't remove newly added file without -f
33394 --pretty=format: fix broken %ct and %at interpolation
33395 Add some basic tests of rev-list --pretty=format
33396 Fix "--pretty=format:" encoding item
33397 t/t6006: add tests for a slightly more complex commit messages
33398 commit: fix pretty-printing of messages with "\nencoding "
33401 sha1_file.c (write_sha1_from_fd): Detect close failure.
33403 Johannes Schindelin (1):
33404 t4118: be nice to non-GNU sed
33406 Junio C Hamano (7):
33407 Document git-log --first-parent
33408 sha1_file.c (write_sha1_file): Detect close failure
33409 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
33410 Fix "--pretty=format:" for parent related items.
33412 Update main git.html page to point at 1.5.0.6 documentation
33415 Linus Torvalds (1):
33416 Fix "getaddrinfo()" buglet
33419 Version v1.5.1-rc2; changes since v1.5.1-rc1:
33420 ---------------------------------------------
33423 Document --quiet option to git-diff
33424 Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
33427 update-hook: abort early if the project description is unset
33428 update-hook: remove e-mail sending hook.
33431 prefer "git COMMAND" over "git-COMMAND" in gitk
33434 make git clone -q suppress the noise with http fetch
33436 Christian Couder (6):
33437 Bisect: implement "git bisect run <cmd>..." to automatically bisect.
33438 Documentation: bisect: reformat some paragraphs.
33439 Documentation: bisect: reword one paragraph.
33440 Documentation: bisect: reformat more paragraphs.
33441 Documentation: bisect: add some titles to some paragraphs.
33442 Documentation: bisect: make a comment fit better in the man page.
33445 gitk: bind <F5> key to Update (reread commits)
33446 git-svn: fix rel_path() when not connected to the repository root
33448 J. Bruce Fields (5):
33449 user-manual: run xsltproc without --nonet option
33450 user-manual: Use def_ instead of ref_ for glossary references.
33451 glossary: stop generating automatically
33452 glossary: clean up cross-references
33453 user-manual: introduce "branch" and "branch head" differently
33455 Jakub Narębski (4):
33456 gitweb: Fix "next" link in commit view
33457 gitweb: Don't escape attributes in CGI.pm HTML methods
33458 gitweb: Fix not marking signoff lines in "log" view
33459 gitweb: Add some installation notes in gitweb/INSTALL
33462 Replace remaining instances of strdup with xstrdup.
33463 use xmalloc in git.c and help.c
33466 user-manual.txt: fix a tiny typo.
33468 Johannes Schindelin (5):
33469 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling
33470 Add a HOWTO for setting up a standalone git daemon
33471 Provide some technical documentation for shallow clones
33472 t4118: be nice to non-GNU sed
33473 git-revert: Revert revert message to old behaviour
33476 Teach git-remote to list pushed branches.
33478 Junio C Hamano (15):
33479 git-log --first-parent: show only the first parent log
33480 blame: micro-optimize cmp_suspect()
33481 blame: cmp_suspect is not "cmp" anymore.
33482 Teach tree_entry_interesting() that the tree entries are sorted.
33483 tree-diff: avoid strncmp()
33484 tree_entry_interesting(): allow it to say "everything is interesting"
33485 git-rebase: make 'rebase HEAD branch' work as expected.
33486 git-apply: Do not free the wrong buffer when we convert the data for writeout
33487 checkout: report where the new HEAD is upon detaching HEAD
33488 git-bisect: typofix
33489 git-bisect.sh: properly dq $GIT_DIR
33490 Fix path-limited "rev-list --bisect" termination condition.
33491 git-am documentation: describe what is taken from where.
33492 Update README to point at a few key periodical messages to the list
33496 gitweb: Change to use explicitly function call cgi->escapHTML()
33498 Linus Torvalds (6):
33499 Fix loose object uncompression check.
33500 Don't ever return corrupt objects from "parse_object()"
33501 Be more careful about zlib return values
33502 Remove "pathlen" from "struct name_entry"
33503 Initialize tree descriptors with a helper function rather than by hand.
33504 Switch over tree descriptors to contain a pre-parsed entry
33506 Michael S. Tsirkin (2):
33507 fix typo in git-am manpage
33508 git-merge: Put FETCH_HEAD data in merge commit message
33510 Nicolas Pitre (10):
33511 clean up the delta base cache size a bit
33512 use a LRU eviction policy for the delta base cache
33513 don't ever allow SHA1 collisions to exist by fetching a pack
33514 index-pack: use hash_sha1_file()
33515 index-pack: more validation checks and cleanups
33516 improve checkout message when asking for same branch
33517 minor git-prune optimization
33518 update HEAD reflog when branch pointed to by HEAD is directly modified
33519 make it more obvious that temporary files are temporary files
33520 write_sha1_from_fd() should make new objects read-only
33523 Documentation/pack-format.txt: Clear up description of types.
33526 git-fetch: Fix single_force in append_fetch_head
33528 Shawn O. Pearce (1):
33529 contrib/continuous: a continuous integration build manager
33531 Uwe Kleine-König (1):
33532 Bisect: convert revs given to good and bad to commits
33535 Version v1.5.1-rc1; changes since v1.5.0.7:
33536 -------------------------------------------
33539 disable t4016-diff-quote.sh on some filesystems
33540 git-gui: Support of "make -s" in: do not output anything of the build itself
33541 More build output cleaning up
33542 Support of "make -s": do not output anything of the build itself
33543 Allow "make -w" generate its usual output
33544 Allow git-diff exit with codes similar to diff(1)
33545 Add tests for --quiet option of diff programs
33547 Alexandre Julliard (1):
33548 git.el: Add support for commit hooks.
33551 Only show log entries for new revisions in hooks--update
33552 Have git-cvsserver call hooks/update before really altering the ref
33553 The "table-of-contents" in the update hook script should match the body
33554 cvsserver: Remove trailing "\n" from commithash in checkin function
33555 cvsserver: Make always-binary mode a config file option
33556 Sample update hook: typofix and modernization to use "git log"
33557 update-hook: fix incorrect use of git-describe and sed for finding previous tag
33559 Aneesh Kumar K.V (1):
33560 Documentation: document remote.<name>.tagopt
33563 git-send-email: configurable bcc and chain-reply-to
33566 builtin-mailinfo.c infrastrcture changes
33567 restrict the patch filtering
33568 Add a couple more test cases to the suite.
33571 git-svn: move authentication prompts into their own namespace
33572 git-svn: cleanup: move process_rm around
33573 git-svn: cleanup: put SVN workarounds into their own namespace
33574 git-svn: cleanup: avoid re-use()ing Git.pm in sub-packages
33575 git-svn: add Git::SVN module (to avoid global variables)
33576 git-svn: convert 'init' to use Git::SVN
33577 git-svn: convert multi-init over to using Git::SVN
33578 git-svn: make multi-init capable of reusing the Ra connection
33579 git-svn: add a test for show-ignore
33580 git-svn: convert show-ignore over to Git::SVN
33581 git-svn: moved the 'log' command into its own namespace
33582 git-svn: port the 'rebuild' command to use Git::SVN objects
33583 git-svn: do not let Git.pm warn if we prematurely close pipes
33584 git-svn: convert the 'commit-diff' command to Git::SVN
33585 git-svn: get rid of Memoize for now...
33586 git-svn: fetch/multi-fetch converted over to Git::SVN module
33587 git-svn: switch dcommit to using Git::SVN code
33588 git-svn: convert 'set-tree' command to use Git::SVN
33589 git-svn: remove graft-branches command
33590 git-svn: add support for metadata in .git/config
33591 git-svn: fix a regression in dcommit that caused empty log messages
33592 git-svn: reuse open SVN::Ra connections by URL
33593 git-svn: enable --minimize to simplify the config and connections
33594 git-svn: fix --follow-parent to work with Git::SVN
33595 git-svn: --follow-parent works with svn-remotes multiple branches
33596 git-svn: disallow ambigious local refspecs
33597 git-svn: allow --follow-parent on deleted directories
33598 git-svn: get rid of additional fetch-arguments
33599 git-svn: allow 'init' to work outside of tests
33600 git-svn: better error reporting if --follow-parent fails
33601 git-svn: 'init' attempts to connect to the repository root if possible
33602 git-svn: --follow-parent now works on sub-directories of larger branches
33603 git-svn: track writes writes to the index in fetch
33604 git-svn: add an odd test case that seems to cause segfaults over HTTP
33605 git-svn: avoid tracking change-less revisions
33606 git-svn: correctly track revisions made to deleted branches
33607 git-svn: fix segfaults from accessing svn_log_changed_path_t
33608 git-svn: fix committing to subdirectories, add tests
33609 git-svn: avoid an extra svn_ra connection during commits
33610 git-svn: simplify usage of the SVN::Git::Editor interface
33611 git-svn: cleanup remove unused function
33612 git-svn: allow multi-fetch to fetch things chronologically
33613 git-svn: correctly track diff-less copies with do_switch
33614 git-svn: correctly handle do_{switch,update} in deep directories
33615 git-svn: stop using path names as refnames with --follow-parent
33616 git-svn: cleanup: move editor-specific variables into the editor namespace
33617 git-svn: just use Digest::MD5 instead of requiring it
33618 git-svn: reinstate the default SVN error handler after using get_log
33619 git-svn: don't rely on do_switch + reparenting with svn(+ssh)://
33620 git-svn: fetch tracks initial change with --follow-parent
33621 git-svn: remove the 'rebuild' command and make the functionality automatic
33622 git-svn: fix several fetch bugs related to repeated invocations
33623 git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanups
33624 git-svn: gracefully handle --follow-parent failures
33625 git-svn: make (multi-)fetch safer but slower
33626 git-svn: avoid a huge memory spike with high-numbered revisions
33627 git-svn: re-enable repacking flags
33628 git-svn: do our best to ensure that our ref and rev_db are consistent
33629 git-svn: avoid redundant get_log calls between invocations
33630 git-svn: use sys* IO functions for reading rev_db
33631 git-svn: don't write to the config file from --follow-parent
33632 git-svn: save paths to tags/branches with for future reuse
33633 git-svn: migrations default to [svn-remote "git-svn"]
33634 git-svn: get rid of revisions_eq check for --follow-parent
33635 git-svn: avoid extra get_log calls when refspecs are added for fetching
33636 git-svn: just name the default svn-remote "svn" instead of "git-svn"
33637 git-svn: prepare multi-init for wildcard support
33638 git-svn: reintroduce using a single get_log() to fetch
33639 git-svn: run get_log() on a sub-directory if possible
33640 git-svn: implement auto-discovery of branches/tags
33641 git-svn: --follow-parent tracks multi-parent paths
33642 git-svn: remove check_path calls before calling do_update
33643 git-svn: remove some noisy debugging messages
33644 git-svn: enable follow-parent functionality by default
33645 git-svn: fix buggy regular expression usage in several places
33646 git-svn: correctly handle the -q flag in SVN::Git::Fetcher
33647 git-svn: correctly handle globs with a right-hand-side path component
33648 git-svn: remove optimized commit stuff for set-tree
33649 git-svn: add support for SVN::Mirror/svk using revprops for metadata
33650 git-svn: add support for per-[svn-remote "..."] options
33651 git-svn: use private $GIT_DIR/svn/config file more
33652 git-svn: extra safety for noMetadata and useSvmProps users
33653 git-svn: use separate, per-repository .rev_db files
33654 git-svn: write the highest maxRex out for branches and tags
33655 git-svn: handle multi-init without --trunk, UseSvmProps fixes
33656 git-svn: make dcommit usable for glob users
33657 git-svn: include merges when calling rev-list for decommit
33658 git-svn: usability fixes for the 'git svn log' command
33659 t910*: s/repo-config/config/g; poke around possible race conditions
33660 git-svn: hopefully make 'fetch' more user-friendly
33661 git-svn: allow 'init' to act as multi-init
33662 git-svn: brown paper bag fixes
33663 git-svn: simplify the (multi-)init methods of fetching
33664 git-svn: allow --log-window-size to be specified, default to 100
33665 git-svn: remember to check for clean indices on globbed refs, too
33666 git-svn: error checking for invalid [svn-remote "..."] sections
33667 git-svn: allow dcommit for those who only fetch from SVM with useSvmProps
33668 git-svn: documentation updates for new functionality
33669 git-svn: add support for --stat in the log command
33670 git-svn: checkout files on new fetches
33671 git-svn: add a 'rebase' command
33672 git-svn: fix some issues for people migrating from older versions
33673 git-svn: hide the private git-svn 'config' file as '.metadata'
33674 git-svn: add 'clone' command, an alias for init + fetch
33675 git-svn: allow overriding of the SVN repo root in metadata
33676 git-svn: add support for using svnsync properties
33677 git-svn: fix useSvmProps, hopefully for the last time
33678 git-svn: add test for useSvnsyncProps
33679 git-svn: documentation updates
33680 git-svn: allow metadata options to be specified with 'init' and 'clone'
33681 git-svn: give show-ignore HEAD smarts, like dcommit and log
33682 git-svn: ensure we're at the top-level and can access $GIT_DIR
33683 git-svn: fix clone when a target directory has been specified
33684 git-svn: fix reconnections to different paths of svn:// repositories
33685 git-svn: fix some potential bugs with --follow-parent
33686 Add test-chmtime: a utility to change mtime on files
33687 Update tests to use test-chmtime
33688 git-svn: fix show-ignore when not connected to the repository root
33689 git-svn: add -l/--local command to "git svn rebase"
33691 Frank Lichtenheld (3):
33692 cvsserver: Use Merged response instead of Update-existing for merged files
33693 cvsserver: Be more chatty
33694 cvsserver: further improve messages on commit and status
33696 Fredrik Kuivinen (1):
33697 New autoconf test for iconv
33699 J. Bruce Fields (1):
33700 Make git-send-email aware of Cc: lines.
33702 Jakub Narębski (1):
33703 gitweb: Don't escape attributes in CGI.pm HTML methods
33706 add: Support specifying an excludes file with a configuration variable
33708 mergetool: Add support for vimdiff.
33711 New fast-import test case for valid tree sorting
33714 I like the idea of the new ':/<oneline prefix>' notation, and gave it a try, but all I could get was a segfault. It was dereferencing a NULL commit list. Fix below. With it, this example now works:
33715 git-grep: don't use sscanf
33717 Johannes Schindelin (42):
33718 Teach revision machinery about --reverse
33719 teach diff machinery about --ignore-space-at-eol
33720 name-rev: introduce the --refs=<pattern> option
33721 diff --check: use colour
33722 apply: fix memory leak in prefix_one()
33723 name-rev: avoid "^0" when unneeded
33724 rev-list --max-age, --max-count: support --boundary
33725 fetch & clone: do not output progress when not on a tty
33726 config: read system-wide defaults from /etc/gitconfig
33727 git grep: use pager
33728 Teach diff -B about colours
33729 apply: make --verbose a little more useful
33730 Teach git-diff-files the new option `--no-index`
33731 pretty-formats: add 'format:<string>'
33732 Make tests independent of global config files
33733 Add git-bundle: move objects and references by archive
33734 git-bundle: assorted fixes
33735 git-bundle: avoid fork() in verify_bundle()
33736 git-bundle: fix 'create --all'
33737 git-bundle: record commit summary in the prerequisite data
33738 Fixup no-progress for fetch & clone
33739 object name: introduce ':/<oneline prefix>' notation
33740 Fix typo: do not show name1 when name2 fails
33741 diff --no-index: also imitate the exit status of diff(1)
33742 Actually make print_wrapped_text() useful
33743 show_date(): rename the "relative" parameter to "mode"
33744 diff: make more cases implicit --no-index
33745 print_wrapped_text: fix output for negative indent
33746 Make git-revert & git-cherry-pick a builtin
33747 diff: support reading a file from stdin via "-"
33748 diff --no-index: support /dev/null as filename
33749 Get rid of the dependency to GNU diff in the tests
33750 cherry-pick: Suggest a better method to retain authorship
33751 format-patch: add --inline option and make --attach a true attachment
33752 bundle: fix wrong check of read_header()'s return value & add tests
33753 git-bundle: avoid packing objects which are in the prerequisites
33754 git-bundle: Make thin packs
33755 git-bundle: handle thin packs in subcommand "unbundle"
33756 git-bundle: die if a given ref is not included in bundle
33757 git-bundle: prevent overwriting existing bundles
33758 git-bundle: only die if pack would be empty, warn if ref is skipped
33759 Do not output "GEN " when generating perl.mak
33762 Add core.symlinks to mark filesystems that do not support symbolic links.
33763 Handle core.symlinks=false case in merge-recursive.
33764 Tell multi-parent diff about core.symlinks.
33766 Julian Phillips (5):
33767 Allow fetch--tool to read from stdin
33768 Use stdin reflist passing in parse-remote
33769 Use stdin reflist passing in git-fetch.sh
33770 git-branch: improve abbreviation of sha1s in verbose mode
33771 git-branch: document new --no-abbrev option
33773 Junio C Hamano (80):
33774 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
33775 Make merge-base a built-in.
33776 Allow in_merge_bases() to take more than one reference commits.
33777 Remove git-resolve.
33778 Remove git-diff-stages.
33779 Add link to v1.5.0 documentation.
33780 blame: --show-stats for easier optimization work.
33781 git-fetch: split fetch_main into fetch_dumb and fetch_native
33782 git-fetch--tool: start rewriting parts of git-fetch in C.
33783 git-fetch: move more code into C.
33784 git-fetch: rewrite another shell loop in C
33785 git-fetch: rewrite expand_ref_wildcard in C
33786 Document --ignore-space-at-eol option.
33788 Point top-level RelNotes link at 1.5.1 release notes being prepared.
33789 t0020: add test for auto-crlf
33790 remotes.not-origin.tagopt
33791 Teach 'git apply' to look at $GIT_DIR/config
33792 Teach core.autocrlf to 'git apply'
33793 Update draft release notes for 1.5.1
33794 Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
33795 git-apply: do not lose cwd when run from a subdirectory.
33796 git-apply: require -p<n> when working in a subdirectory.
33797 Link 1.5.0.1 documentation from the main page.
33799 Mechanical conversion to use prefixcmp()
33800 prefixcmp(): fix-up mechanical conversion.
33801 prefixcmp(): fix-up leftover strncmp().
33802 t4119: add test for traditional patch and different p_value
33803 Fix botched "leak fix"
33804 git-apply: notice "diff --git" patch again
33805 git-apply: guess correct -p<n> value for non-git patches.
33806 t4119: test autocomputing -p<n> for traditional diff input.
33807 git-status: do not be totally useless in a read-only repository.
33808 update-index: do not die too early in a read-only repository.
33809 run_diff_{files,index}(): update calling convention.
33810 .mailmap maintenance after pulling from git-svn
33811 bundle: reword missing prerequisite error message
33812 git-fetch--tool takes flags before the subcommand.
33813 diff --cached: give more sensible error message when HEAD is yet to be created.
33814 Documentation: link in 1.5.0.2 material to the top documentation page.
33815 builtin-fetch--tool: adjust to updated sha1_object_info().
33816 Make 'cvs ci' lockless in git-cvsserver by using git-update-ref
33817 fetch--tool: fix uninitialized buffer when reading from stdin
33818 builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
33819 index_fd(): use enum object_type instead of type name string.
33820 index_fd(): pass optional path parameter as hint for blob conversion
33821 index_fd(): convert blob only if it is a regular file.
33822 Add recent changes to draft 1.5.1 release notes.
33823 git-fetch: retire update-local-ref which is not used anymore.
33824 builtin-fetch--tool: fix reflog notes.
33825 diff-ni: allow running from a subdirectory.
33826 diff-ni: fix the diff with standard input
33827 .gitignore: add git-fetch--tool
33828 format-patch --attach: not folding some long headers.
33829 Post 1.5.0.3 cleanup
33830 fsck: fix broken loose object check.
33831 unpack_sha1_file(): detect corrupt loose object files.
33832 fsck: exit with non-zero status upon errors
33833 git-bundle: fix pack generation.
33834 revision walker: Fix --boundary when limited
33835 revision traversal: retire BOUNDARY_SHOW
33836 git-bundle: various fixups
33837 revision traversal: SHOWN means shown
33838 git-bundle: make verify a bit more chatty.
33839 revision --boundary: fix stupid typo
33840 revision --boundary: fix uncounted case.
33841 Fix broken create_branch() in builtin-branch.
33842 prepare_packed_git(): sort packs by age and localness.
33843 Documentation: add git-mergetool to the command list.
33844 shortlog: prompt when reading from terminal by mistake
33845 Remove unused diffcore_std_no_resolve
33847 Teach --quiet to diff backends.
33848 revision.c: explain what tree_difference does
33849 try-to-simplify-commit: use diff-tree --quiet machinery.
33850 applymbox: brown paper bag fix.
33851 Update main git.html page to point at 1.5.0.5 documentation
33856 gitweb: Change to use explicitly function call cgi->escapHTML()
33858 Linus Torvalds (8):
33859 Lazy man's auto-CRLF
33860 Make AutoCRLF ternary variable.
33861 Re-fix get_sha1_oneline()
33862 Make trivial wrapper functions around delta base generation and freeing
33863 Implement a simple delta_base cache
33864 Avoid unnecessary strlen() calls
33865 Trivial cleanup of track_tree_refs()
33866 Set up for better tree diff optimizations
33869 Support for large files on 32bit systems.
33871 Michael Coleman (2):
33872 git-send-email: abort/usage on bad option
33873 fix various doc typos
33875 Nicolas Pitre (12):
33876 sha1_file.c: cleanup hdr usage
33877 sha1_file.c: cleanup "offset" usage
33878 sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
33879 formalize typename(), and add its reverse type_from_string()
33880 convert object type handling from a string to a number
33881 get rid of lookup_object_type()
33882 make sure enum object_type is signed
33883 local-fetch.c: some error printing cleanup
33884 fix t5300-pack-object.sh
33885 add test for OFS_DELTA objects
33886 clean up pack index handling a bit
33887 Reuse cached data out of delta base cache.
33890 git-config: document --rename-section, provide --remove-section
33891 git-archimport: allow remapping branch names
33892 git-commit: add a --interactive option
33893 git-branch, git-checkout: autosetup for remote branch tracking
33894 git-fetch, git-branch: Support local --track via a special remote '.'
33897 git-remote: support remotes with a dot in the name
33900 git-svn: make test for SVK mirror path import
33901 git-svn: don't consider SVN URL usernames significant when comparing
33902 git-svn: document --username
33905 t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
33906 t/t5515-fetch-merge-logic.sh: Add two more tests
33909 Documentation/git-svn.txt: Fix formatting errors
33911 Shawn O. Pearce (43):
33912 Cleanup check_valid in commit-tree.
33913 cherry-pick: Bug fix 'cherry picked from' message.
33914 Make 'make' quieter while building git
33915 Make 'make' quiet by default
33916 Display the null SHA-1 as the base for an OBJ_OFS_DELTA.
33917 Fix mmap leak caused by reading bad indexes.
33918 Don't build external_grep if its not used
33919 General const correctness fixes
33920 Use uint32_t for all packed object counts.
33921 Use uint32_t for pack-objects counters.
33922 Use off_t when we really mean a file offset.
33923 Use off_t in pack-objects/fast-import when we mean an offset
33924 Cast 64 bit off_t to 32 bit size_t
33925 Preallocate memory earlier in fast-import
33926 Move post-update hook to after all other activity
33927 Don't run post-update hook unless a ref changed
33928 Refactor run_update_hook to be more useful
33929 Refactor handling of error_string in receive-pack
33930 Teach receive-pack to run pre-receive/post-receive hooks
33931 Use atomic updates to the fast-import mark file
33932 Allow fast-import frontends to reload the marks table
33933 Switch to run_command_v_opt in revert
33934 Remove unused run_command variants
33935 Start defining a more sophisticated run_command
33936 Split run_command into two halves (start/finish)
33937 Teach run_command how to setup a stdin pipe
33938 Refactor run_command error handling in receive-pack
33939 Split back out update_hook handling in receive-pack
33940 Change {pre,post}-receive hooks to use stdin
33941 Remove unnecessary casts from fast-import
33942 Simplify closing two fds at once in run-command.c
33943 Fix t5510-fetch's use of sed
33944 Teach run-command about stdout redirection
33945 Teach run-command to redirect stdout to /dev/null
33946 Replace fork_with_pipe in bundle with run_command
33947 Correct new compiler warnings in builtin-revert
33948 Use RUN_GIT_CMD to run push backends
33949 Use run_command for proxy connections
33950 Use run_command within merge-index
33951 Use run_command within receive-pack to invoke index-pack
33952 Use run_command within send-pack
33954 Limit the size of the new delta_base_cache
33956 Simon 'corecode' Schubert (1):
33957 Allow passing of an alternative CVSROOT via -d.
33960 Teach git-remote to update existing remotes by fetching from them
33961 Add config_boolean() method to the Git perl module
33962 Allow git-remote to update named groups of remotes
33963 Add git-mergetool to run an appropriate merge conflict resolution program
33964 mergetool: print an appropriate warning if merge.tool is unknown
33966 Xavier Maillard (1):
33967 contrib/emacs: Use non-interactive function to byte-compile files
33970 Version v1.5.0.7; changes since v1.5.0.6:
33971 -----------------------------------------
33974 Documentation/git-svnimport.txt: fix typo.
33975 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
33977 H. Peter Anvin (1):
33978 git-upload-pack: make sure we close unused pipe ends
33980 Junio C Hamano (2):
33981 rerere should not repeat the earlier hunks in later ones
33985 Version v1.5.0.6; changes since v1.5.0.5:
33986 -----------------------------------------
33988 J. Bruce Fields (5):
33989 user-manual: run xsltproc without --nonet option
33990 user-manual: Use def_ instead of ref_ for glossary references.
33991 glossary: stop generating automatically
33992 glossary: clean up cross-references
33993 user-manual: introduce "branch" and "branch head" differently
33995 Jakub Narębski (4):
33996 gitweb: Fix "next" link in commit view
33997 gitweb: Don't escape attributes in CGI.pm HTML methods
33998 gitweb: Fix not marking signoff lines in "log" view
33999 gitweb: Add some installation notes in gitweb/INSTALL
34002 commit: fix pretty-printing of messages with "\nencoding "
34005 user-manual.txt: fix a tiny typo.
34007 Johannes Schindelin (1):
34008 t4118: be nice to non-GNU sed
34010 Junio C Hamano (2):
34011 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
34015 gitweb: Change to use explicitly function call cgi->escapHTML()
34017 Michael S. Tsirkin (1):
34018 fix typo in git-am manpage
34021 Documentation/pack-format.txt: Clear up description of types.
34024 Version v1.5.0.5; changes since v1.5.0.4:
34025 -----------------------------------------
34027 Junio C Hamano (1):
34031 git-merge: finish when git-read-tree fails
34034 Version v1.5.0.4; changes since v1.5.0.3:
34035 -----------------------------------------
34037 Alexandre Julliard (2):
34038 git.el: Avoid appending a signoff line that is already present.
34039 git.el: Retrieve commit log information from .dotest directory.
34042 git-send-email: Document configuration options
34044 Brian Gernhardt (1):
34045 Fix diff-options references in git-diff and git-format-patch
34047 Frank Lichtenheld (1):
34048 cvsserver: asciidoc formatting changes
34050 J. Bruce Fields (7):
34051 glossary: fix overoptimistic automatic linking of defined terms
34052 user-manual: fix inconsistent example
34053 user-manual: fix inconsistent use of pull and merge
34054 user-manual: fix missing colon in git-show example
34055 user-manual: fix rendering of history diagrams
34056 user-manual: install user manual stylesheet with other web documents
34057 git-merge: warn when -m provided on a fast forward
34060 Documentation: s/seperator/separator/
34061 fast-import: grow tree storage more aggressively
34063 Johannes Schindelin (2):
34064 Begin SubmittingPatches with a check list
34065 make t8001 work on Mac OS X again
34067 Junio C Hamano (3):
34068 git-commit: cd to top before showing the final stat
34069 git-checkout: fix "eval" used for merge labelling.
34072 Matthias Kestenholz (1):
34073 Adjust reflog filemode in shared repository
34075 Matthias Lederhofer (1):
34076 setup_git_directory_gently: fix off-by-one error
34078 Shawn O. Pearce (13):
34079 git-gui: Relocate the menu/transport menu code.
34080 git-gui: Add Reset to the Branch menu.
34081 git-gui: Don't create empty (same tree as parent) commits.
34082 git-gui: Remove unnecessary /dev/null redirection.
34083 fast-import: Avoid infinite loop after reset
34084 fast-import: Fail if a non-existant commit is used for merge
34085 git-gui: Make 'make' quieter by default
34086 Catch write_ref_sha1 failure in receive-pack
34087 git-gui: Allow committing empty merges
34088 git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44.
34089 git-gui: Revert "git-gui: Display all authors of git-gui." This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af.
34090 git-gui: Allow 'git gui version' outside of a repository
34091 Don't package the git-gui credits file anymore
34094 Add definition of <commit-ish> to the main git man page.
34097 Clarify doc for git-config --unset-all.
34100 Version v1.5.0.3; changes since v1.5.0.2:
34101 -----------------------------------------
34103 Alexandre Julliard (1):
34104 git.el: Set the default commit coding system from the repository config.
34106 Aneesh Kumar K.V (1):
34107 blameview: Fix the browse behavior in blameview
34109 Christian Schlotter (1):
34110 Documentation: Correct minor typo in git-add documentation.
34112 Eygene Ryabinkin (2):
34113 http-push.c::lock_remote(): validate all remote refs.
34114 Another memory overrun in http-push.c
34117 git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.
34118 Fix quoting in update hook template
34120 J. Bruce Fields (6):
34121 Documentation: mention module option to git-cvsimport
34122 user-manual: reset to ORIG_HEAD not HEAD to undo merge
34123 user-manual: ensure generated manual references stylesheet
34124 user-manual: insert earlier of mention content-addressable architecture
34125 user-manual: how to replace commits older than most recent
34126 user-manual: more detailed merge discussion
34129 diff --cc: integer overflow given a 2GB-or-larger file
34131 Johannes Schindelin (3):
34132 fetch.o depends on the headers, too.
34133 builtin-archive: use RUN_SETUP
34134 Document the config variable format.suffix
34136 Junio C Hamano (5):
34137 git-apply: do not fix whitespaces on context lines.
34138 Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url
34139 Start preparing Release Notes for 1.5.0.3
34140 git-merge: fail correctly when we cannot fast forward.
34143 Linus Torvalds (2):
34144 mailinfo: do not get confused with logical lines that are too long.
34145 git-show: Reject native ref
34147 Matthias Kestenholz (1):
34148 Fix git-gc usage note
34150 Michael Coleman (2):
34151 Fix minor typos/grammar in user-manual.txt
34152 builtin-fmt-merge-msg: fix bugs in --file option
34155 Correct ordering in git-cvsimport's option documentation
34158 git-archimport: support empty summaries, put summary on a single line.
34160 Ramsay Allan Jones (5):
34161 Fix a "label defined but unreferenced" warning.
34162 Fix an "implicit function definition" warning.
34163 Fix some "comparison is always true/false" warnings.
34164 Fix a "pointer type missmatch" warning.
34165 Unset NO_C99_FORMAT on Cygwin.
34168 Documentation/build-docdep.perl: Fix dependencies for included asciidoc files
34169 Documentation/git-quiltimport.txt: Fix labeled list formatting
34170 Documentation/git-send-email.txt: Fix labeled list formatting
34172 Shawn O. Pearce (1):
34173 index-pack: Loop over pread until data loading is complete.
34176 Fix git-show man page formatting in the EXAMPLES section
34178 Uwe Kleine-König (1):
34179 Include config.mak in doc/Makefile
34182 glossary: Add definitions for dangling and unreachable objects
34185 Version v1.5.0.2; changes since v1.5.0.1:
34186 -----------------------------------------
34188 Christian Schlotter (1):
34189 git-clone: Sync documentation to usage note.
34191 Dmitry V. Levin (1):
34192 git-show-ref --verify: Fail if called without a reference
34194 Fredrik Kuivinen (1):
34195 Fix 'git commit -a' in a newly initialized repository
34198 Add a compat/strtoumax.c for Solaris 8.
34199 Obey NO_C99_FORMAT in fast-import.c.
34200 Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.
34202 Johannes Schindelin (1):
34203 git-diff: fix combined diff
34205 Junio C Hamano (11):
34206 Reword git-am 3-way fallback failure message.
34207 diff-patch: Avoid emitting double-slashes in textual patch.
34208 Don't modify CREDITS-FILE if it hasn't changed.
34209 rerere: do not skip two conflicted paths next to each other.
34210 rerere: do not deal with symlinks.
34211 Add Release Notes to prepare for 1.5.0.2
34212 merge-index: fix longstanding bug in merging symlinks
34213 merge-recursive: fix longstanding bug in merging symlinks
34214 diff --cc: fix display of symlink conflicts during a merge.
34215 Documentation: describe "-f/-t/-m" options to "git-remote add"
34218 Martin Koegler (1):
34219 git-gui: Create new branches from a tag.
34221 Michael Loeffler (1):
34222 Use gunzip -c over gzcat in import-tars example.
34225 git-remote: support remotes with a dot in the name
34227 Robin Rosenberg (1):
34228 Limit filename for format-patch
34231 Allow arbitrary number of arguments to git-pack-objects
34234 core.legacyheaders: Use the description used in RelNotes-1.5.0
34236 Shawn O. Pearce (16):
34237 git-gui: Refactor 'exec git subcmd' idiom.
34238 git-gui: Basic version check to ensure git 1.5.0 or later is used.
34239 git-gui: Permit merging tags into the current branch.
34240 git-gui: More consistently display the application name.
34241 git-gui: Print version on the console.
34242 git-gui: Prefer version file over git-describe.
34243 git-gui: Expose the browser as a subcommand.
34244 git-gui: Correct crash when saving options in blame mode.
34245 git-gui: Use mixed path for docs on Cygwin.
34246 git-gui: Display all authors of git-gui.
34247 git-gui: Change summary of git-gui.
34248 git-gui: Include browser in our usage message.
34249 git-gui: Remove TODO list.
34250 git-gui: Don't crash in citool mode on initial commit.
34251 Document the new core.bare configuration option.
34252 Include git-gui credits file in dist.
34255 Version v1.5.0.1; changes since v1.5.0:
34256 ---------------------------------------
34258 Alexandre Julliard (2):
34259 git-daemon: Avoid leaking the listening sockets into child processes.
34260 sha1_file.c: Round the mmap offset to half the window size.
34262 Fredrik Kuivinen (2):
34263 Read the config in rev-list
34264 Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
34266 Junio C Hamano (15):
34267 Documentation: Drop full-stop from git-fast-import title.
34268 cmd-list: add git-remote
34269 Makefile: update check-docs target
34270 Clarify two backward incompatible repository options.
34271 Still updating 1.5.0 release notes.
34272 Add RelNotes 1.5.0.1
34273 Make sure packedgitwindowsize is multiple of (pagesize * 2)
34274 Make gitk work reasonably well on Cygwin.
34275 gitk: Use show-ref instead of ls-remote
34276 GIT-VERSION-FILE: check ./version first.
34277 pretend-sha1: grave bugfix.
34278 git-merge: minor fix for no_trivial_merge_strategies.
34279 Do not take mode bits from index after type change.
34280 Update draft release notes for 1.5.0.1
34284 gitk - remove trailing whitespace from a few lines.
34285 Make gitk save and restore the user set window position.
34286 Make gitk save and restore window pane position on Linux and Cygwin.
34289 Minor corrections to release notes
34291 Paul Mackerras (1):
34292 Change git repo-config to git config
34294 Shawn O. Pearce (2):
34295 Attempt to improve git-rebase lead-in description.
34296 Convert update-index references in docs to add.
34299 git-blame: prevent argument parsing segfault
34302 Version v1.5.0; changes since v1.5.0-rc4:
34303 -----------------------------------------
34305 Alexandre Julliard (3):
34306 diff.c: Reuse the pprint_rename function for diff --summary output.
34307 diff.c: Properly quote file names in diff --summary output.
34308 diff.c: More logical file name quoting for renames in diffstat.
34311 git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
34312 Fix potential command line overflow in hooks--update
34314 Aneesh Kumar K.V (1):
34315 blameview: Move the commit info to a pane below the blame window.
34318 Handle uncommitted changes and cache descriptions
34319 git-blame.el: improve color handling
34320 git-blame.el: blame unsaved changes
34321 git-blame.el: Doc fixes and cleanup
34322 git-blame.el: Autoupdate while editing
34325 Make it easier to override path to asciidoc command
34328 git-svn: correctly handle boolean options via git-config
34330 Jakub Narębski (2):
34331 git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate
34332 git-blame: Change installation instructions
34335 Read cvsimport options from repo-config
34337 Johannes Schindelin (5):
34338 for_each_reflog_ent: be forgiving about missing message
34339 log --reflog: honour --relative-date
34340 format-patch -n: make sorting easier by padding number
34341 log --reflog: use dwim_log
34342 git-gc: run pack-refs by default unless the repo is bare
34344 Junio C Hamano (17):
34345 create_symref(): create leading directories as needed.
34346 reflog: handle $name => remotes/%s/HEAD mapping consistently for logs
34347 Documentation/git-pull: describe default behaviour and config interactions
34348 git-fetch: document automatic tag following.
34349 wt_status_prepare(): clean up structure initialization.
34350 diff_flush_name(): take struct diff_options parameter.
34351 t4016: test quoting funny pathnames in diff output
34352 Documentation: git-rebase -C<n>
34353 Teach git-am to pass -p option down to git-apply
34354 Add discussion section to git-tag documentation.
34355 Add RPM target for git-gui
34356 Do not forget to pack objects reachable from HEAD reflog.
34357 for-each-reflog: not having $GIT_DIR/logs directory is not an error.
34358 "git-fetch --tags $URL" should not overwrite existing tags
34359 Documentation: Moving out of detached HEAD does not warn anymore.
34360 Add release notes to the distribution.
34363 Linus Torvalds (2):
34365 Mark places that need blob munging later for CRLF conversion.
34368 Make gitk save and restore the user set window position.
34369 Make gitk save and restore window pane position on Linux and Cygwin.
34371 Matthias Lederhofer (1):
34372 git merge documentation: -m is optional
34374 Michael Loeffler (1):
34375 import-tars: brown paper bag fix for file mode.
34377 Michael S. Tsirkin (3):
34378 Update git-log and git-show documentation
34379 add -C[NUM] to git-am
34380 Document that git-am can read standard input.
34383 Work around Subversion race in git-svn tests.
34386 Fixed some typos in git-repack docs
34389 remove mailmap.linux
34390 Update RPM core package description
34393 Clarify that git-update-server-info should be run for every git-push
34396 Avoid ugly linewrap in git help
34398 Shawn O. Pearce (313):
34399 git-gui: Initial revision.
34400 git-gui: Additional early feature development.
34401 git-gui: Fixed UI layout problems on Windows.
34402 git-gui: Corrected keyboard bindings on Windows, improved state management.
34403 git-gui: Verify we should actually perform a commit when asked to do so.
34404 git-gui: Finished commit implementation.
34405 git-gui: Implemented amended commits.
34406 git-gui: Misc. nit type of bug fixes.
34407 git-gui: Started construction of fetch and push operations.
34408 git-gui: Worked around environment variable problems on Windows.
34409 git-gui: Reorganized startup procedure to ensure gitdir is right.
34410 git-gui: Fix menu item accelerator display on Mac OS X.
34411 git-gui: Correctly handle CR vs. LF within the console of fetch.
34412 git-gui: Check for fetch or push command failure and denote it.
34413 git-gui: Don't complain if no .git/remotes exist.
34414 git-gui: Added current TODO list.
34415 git-gui: Last minute idea about fetch shortcuts.
34416 git-gui: Automatically reopen any console closed by the user.
34417 git-gui: Cache all repo-config data in an array.
34418 git-gui: Added support for pulling from default branch of a remote.
34419 git-gui: Updated TODO list now that pull is starting to work.
34420 git-gui: Corrected diff-index/diff-files protocol parsing errors.
34421 git-gui: Performance improvements for large file sets.
34422 git-gui: More performance improvements to rescan logic.
34423 git-gui: Flip commit message buffer and diff area.
34424 git-gui: Added repack database menu option, to invoke git repack.
34425 git-gui: Allow the user to disable update-index --refresh during rescan.
34426 git-gui: Grab the index lock while running pull.
34427 git-gui: Pluralize timestamps within the options menu.
34428 git-gui: Disable pull menu items when the index is locked.
34429 git-gui: Don't let the user pull into an uncommitted working directory.
34430 git-gui: Update TODO list.
34431 git-gui: Bug fix for bad variable reference in display_file.
34432 git-gui: Changed term 'check-in' to 'include'.
34433 git-gui: Show only the abbreviated SHA1 after committing.
34434 git-gui: Cache the GIT_COMMITTER_IDENT value on first sign-off.
34435 git-gui: Save window geometry to .git/config during exit.
34436 git-gui: Change accelerator for "Include All" to M1-I.
34437 git-gui: Created edit menu and basic editing bindings.
34438 git-gui: Clear undo/redo stack when loading a message file from disk.
34439 git-gui: Updated TODO list now that geometry is stored.
34440 git-gui: Always indicate the file in the diff viewer.
34441 git-gui: Correctly handle files containing LF in their name.
34442 git-gui: Efficiently update the UI after committing.
34443 git-gui: Use catch rather than array names to check file.
34444 git-gui: Rename difffont/mainfont variables.
34445 git-gui: Use native tk_messageBox for errors.
34446 git-gui: Cleaned up error message formatting.
34447 git-gui: Simplified format of geometry configuration.
34448 git-gui: Misc. formatting cleanups.
34449 git-gui: Misc. bug fixes for mouse click crashes.
34450 git-gui: Added context menus for consoles and commit message buffer.
34451 git-gui: Fix mouse cursor behavior when in widgets.
34452 git-gui: Teach sign off to be more intelligent.
34453 git-gui: Corrected font used for options menu items.
34454 git-gui: Honor system font and let user configure fonts.
34455 git-gui: Allow the user to change the diff viewer font size.
34456 git-gui: Refresh a file if it has an empty diff.
34457 git-gui: Make use of the Tk font system rather than faking it.
34458 git-gui: Improve right click context menu binding on all platforms.
34459 git-gui: Rename quitting global to is_quitting.
34460 git-gui: Use arrow cursor rather than left_ptr.
34461 git-gui: Refactor options menu into an options dialog.
34462 git-gui: Allow the user to manipulate the fonts from the options panel.
34463 git-gui: Supply progress feedback when running update-index.
34464 git-gui: Minor options dialog UI cleanups.
34465 git-gui: Added Options... menu item to end of diff context menu.
34466 git-gui: Use 'after 1' to post UI rather than tkwait.
34467 git-gui: Correct bugs in font config handling.
34468 git-gui: Hide non-commit related commands when invoked as git-citool.
34469 git-gui: Don't load the global options unless necessary.
34470 git-gui: Allow the user to disable diff stat summary during pull.
34471 git-gui: Run the pre-commit hook in the background.
34472 git-gui: Remove the commit_active global variable.
34473 git-gui: Added post-commit invocation after the commit is done.
34474 git-gui: Always use eq/ne for string comparsions.
34475 git-gui: Reshow diff if we sent the file to update-index.
34476 git-gui: Cleanup diff construction code to prepare for more options.
34477 git-gui: Allow the user to control the number of context lines in a diff.
34478 git-gui: Sort the list of paths being updated in the index.
34479 git-gui: Use a smaller pipe buffer for update-index.
34480 git-gui: Allow the user to copy name of the file in the diff viewer.
34481 git-gui: Correct language for M_/A_ status codes.
34482 git-gui: Display status on left in diff header.
34483 git-gui: Minor UI layout improvements for console windows.
34484 git-gui: Reverted file name text field to a label.
34485 git-gui: By default don't allow partially included files.
34486 git-gui: Refactor mouse clicking on file names/icons.
34487 git-gui: Narrow the no differences information message.
34488 git-gui: Implemented multiple selection in file lists.
34489 git-gui: Refactor update_status -> rescan.
34490 git-gui: Provide an after-rescan script to rescan.
34491 git-gui: Allow update_index to also run a script when it completes.
34492 git-gui: Automatically update-index all included files before commit.
34493 git-gui: Disable diff actions when no diff is active.
34494 git-gui: Created makefile to install the program.
34495 git-gui: Correctly handle GIT_DIR environment variable.
34496 git-gui: Create Windows shortcut icons for git-gui.
34497 git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
34498 git-gui: Handle ' within paths when creating Windows shortcuts.
34499 git-gui: Only populate a fetch or push if we have an action.
34500 git-gui: Create a .app file on MacOS X if requested.
34501 git-gui: Display error dialog on Mac OS X when no .git found.
34502 git-gui: Make initial commits work properly.
34503 git-gui: Only reshow diff when really necessary.
34504 git-gui: Refactor file state representations.
34505 git-gui: Add menu option to include only selected files.
34506 git-gui: Misc. comment formatting cleanups.
34507 git-gui: Start UI with the index locked.
34508 git-gui: Remove completed items from TODO list.
34509 git-gui: Toggle between new commit and amend commit modes.
34510 git-gui: Verify the user has GIT_COMMITTER_IDENT before comitting.
34511 git-gui: Rephrase rescan before commit informational message.
34512 git-gui: Allow adding untracked files in selection.
34513 git-gui: Don't create PkgInfo on Mac OS X "desktop icons".
34514 git-gui: Teach the gui how to uninclude a file.
34515 git-gui: Make consecutive icon clicks toggle included status of a file.
34516 git-gui: Correct toggling of deleted file status.
34517 git-gui: Fix list loading corruption introduced by 1461c5f3.
34518 git-gui: Describe deleted symlinks in a more friendly way.
34519 git-gui: Correct toggling of added/untracked status for new files.
34520 git-gui: Updated TODO list now that a task is complete.
34521 git-gui: Refactored diff line display formatting logic.
34522 git-gui: Restore the all important shebang line.
34523 git-gui: Update in memory states after commit.
34524 git-gui: Correct some state matchings for include/remove.
34525 git-gui: Improve handling of merge commits.
34526 git-gui: Allow users to run fsck-objects from the gui.
34527 git-gui: Don't save amended commit message buffer.
34528 git-gui: Reworded verify console title.
34529 git-gui: Seperate out the database operations in project menu.
34530 git-gui: Rename Project menu to Repository.
34531 git-gui: Added about dialog box.
34532 git-gui: Be more Macintosh like.
34533 git-gui: Make the copyright notice serve double duty.
34534 git-gui: Include the Tcl/Tk version in the about dialog.
34535 git-gui: Abstract out windows platform test to is_Windows proc.
34536 git-gui: Correct is_MacOSX platform test.
34537 git-gui: Warn Cygwin users about possible environment issues.
34538 git-gui: Added configuration editor TODO list.
34539 git-gui: Refactor M1 binding selection.
34540 git-gui: Added menu command to visualize all branches.
34541 git-gui: Don't start 'gitk --all' on Mac OS X.
34542 git-gui: Improve pull error dialogs.
34543 git-gui: Added revert changes command.
34544 git-gui: Display the current branch.
34545 git-gui: Support file state MD (modified/deleted).
34546 git-gui: Created Branch menu.
34547 git-gui: Parse off refs/remotes when showing current branch.
34548 git-gui: Abort on not implemented branch switching.
34549 git-gui: Automatically skip tracking branches in branch menu.
34550 git-gui: Rename all_branches -> all_heads.
34551 git-gui: Misc. comment and formatting cleanups.
34552 git-gui: Started implementation of switch_branch.
34553 git-gui: Set a proper title on our revert confirm dialog box.
34554 git-gui: Updated todo list.
34555 git-gui: Enable resolution of merge conflicts.
34556 git-gui: Auto-update any A? or M? files during rescan.
34557 git-gui: Reworded 'Include' to 'Add' to match core Git.
34558 git-gui: Created very crude Tools menu, to support miga.
34559 git-gui: Show all fetched branches for remote pulls.
34560 git-gui: Run git-gc rather than git-repack.
34561 git-gui: Corrected behavior of deleted (but existing in HEAD) files.
34562 git-gui: Correct wording of the revert confirmation dialog.
34563 git-gui: Work around odd cygpath bug on Windows.
34564 git-gui: Change more 'include' language to 'add'.
34565 git-gui: Hide the ugly bash command line from the windows desktop icon.
34566 git-gui: Modified makefile to embed version into git-gui script.
34567 git-gui: Display the git-gui version in the Help->About dialog.
34568 git-gui: Display the full GPL copyright notice in about dialog.
34569 git-gui: Ensure version number is always current.
34570 git-gui: Allow the user to copy the version data to the clipboard.
34571 git-gui: Don't offer my miga hack if its configuration file isn't present.
34572 git-gui: Suggest when running 'git gc' may be worthwhile.
34573 git-gui: Refactor reponame computation.
34574 git-gui: Cleanup usage of gitdir global variable.
34575 git-gui: Allow [gitdir ...] to act as [file join [gitdir] ...].
34576 git-gui: Make the gitk starting message match our usual format.
34577 git-gui: Display the directory we are entering during startup.
34578 git-gui: Start file status display refactoring.
34579 git-gui: Convert UI to use 'staged for commit' interface.
34580 git-gui: Correct DD file state to be only D_.
34581 git-gui: Remove invalid DM state.
34582 git-gui: Cleanup state descriptions.
34583 git-gui: Refactor add/remove proc names to align with reality.
34584 git-gui: Add or unstage based on the specific icon used.
34585 git-gui: Refactor the revert (aka checkout-index) implementation.
34586 git-gui: Refactor the add to commit state filters.
34587 git-gui: Simplify printing of index info to update-index.
34588 git-gui: Only permit selection in one list at a time.
34589 git-gui: Pad the cancel/save buttons in the options window.
34590 git-gui: Implemented create branch GUI.
34591 git-gui: Bind M1-N to create branch.
34592 git-gui: Implemented local branch deletion.
34593 git-gui: Allow users to delete branches merged upstream.
34594 git-gui: Allow creating branches from tracking heads.
34595 git-gui: Use borders on text fields in branch dialog.
34596 git-gui: Remove 'Allow Partially Added Files' option.
34597 git-gui: Move commit_prehook into commit_tree.
34598 git-gui: Improve the branch delete confirmation dialogs.
34599 git-gui: Don't delete the test target branch.
34600 git-gui: Attempt to checkout the new branch after creation.
34601 git-gui: Refactor current_diff -> current_diff_path.
34602 git-gui: Remove combined diff showing behavior.
34603 git-gui: Improve the display of merge conflicts.
34604 git-gui: Improve diff --cc viewing for unmerged files.
34605 git-gui: Fix bug in unmerged file display.
34606 git-gui: Clear diff from viewer if the side changed.
34607 git-gui: Correct disappearing unstaged files.
34608 git-gui: Add Refresh to diff viewer context menu.
34609 git-gui: Correct unmerged file detection at commit time.
34610 git-gui: Pad new branch name input box.
34611 git-gui: Use a grid layout for branch dialog.
34612 git-gui: Improve the merge check interface for branch deletion.
34613 git-gui: Change rude error popup to info popup.
34614 git-gui: Correctly ignore '* Unmerged path' during diff.
34615 git-gui: Make diff viewer colors match gitk's defaults.
34616 git-gui: Never line wrap in file lists.
34617 git-gui: Don't offer tracking branches if none exist.
34618 git-gui: Give a better error message on an empty branch name.
34619 git-gui: Allow user to specify a branch name pattern.
34620 git-gui: Improve keyboard traversal in dialogs.
34621 git-gui: Fully select a field when entering into it.
34622 git-gui: Automatically toggle the relevant radio buttons.
34623 git-gui: Correctly categorize tracking branches and heads.
34624 git-gui: Update todo list with finished and new items.
34625 git-gui: Slightly tweak new window geometry.
34626 git-gui: Create missing branch head on initial commit.
34627 git-gui: Don't format the mode line of a diff.
34628 git-gui: Force an update-index --refresh on unchanged files.
34629 git-gui: Don't attempt to tag new file/deleted file headers in diffs.
34630 git-gui: Fix 'Select All' action on Windows.
34631 git-gui: Ignore 'No newline at end of file' marker line.
34632 git-gui: Always start a rescan on an empty diff.
34633 git-gui: Don't show content of untracked binary files.
34634 git-gui: Limit display of large untracked files.
34635 git-gui: When possible show the type of an untracked file.
34636 git-gui: Don't try to tag the 'Binary files * and * differ' line.
34637 git-gui: Remove spurious newline in untracked file display.
34638 git-gui: Honor system encoding for filenames.
34639 git-gui: Handle commit encoding better.
34640 git-gui: Display database stats (count-objects -v) on demand.
34641 git-gui: Implement basic branch switching through read-tree.
34642 git-gui: Use system default labelframe bordering.
34643 git-gui: Display the size of the pack directory.
34644 git-gui: Only allow Refresh in diff context menu when we have a diff.
34645 git-gui: Allow staging/unstaging individual diff hunks.
34646 git-gui: Elide CRs appearing in diff output from display.
34647 git-gui: Cleanup end-of-line whitespace in commit messages.
34648 git-gui: Unset unnecessary UI setup variable.
34649 git-gui: Force focus to the diff viewer on mouse click.
34650 git-gui: Support 'Visualize All Branches' on Mac OS X.
34651 git-gui: Pad the database statistics dialog window.
34652 git-gui: Prefer Tk's entry widget over a 1 line text field.
34653 git-gui: Remove Pull menu and cleanup Branch/Fetch/Push menus.
34654 git-gui: Don't switch branches if changing to the current branch.
34655 git-gui: Maintain the same file list for diff during refresh.
34656 git-gui: Always use lsearch -exact, to prevent globbing.
34657 git-gui: Added arbitrary branch pushing support.
34658 git-gui: Remove no longer used pull from remote code.
34659 git-gui: Always use -v option to push.
34660 git-gui: Refactor console success/failure handling.
34661 git-gui: Use builtin version of 'git gc'.
34662 git-gui: Implement local merge operations.
34663 git-gui: Let users abort with `reset --hard` type logic.
34664 git-gui: Update status bar during a merge.
34665 git-gui: Don't allow users to commit a bad octopus merge.
34666 git-gui: Don't allow merges in the middle of other things.
34667 git-gui: Always offer scrollbars for branch lists.
34668 git-gui: Support merge.summary, merge.verbosity.
34669 git-gui: Reword meaning of merge.summary.
34670 git-gui: Offer quick access to the HTML formatted documentation.
34671 git-gui: Test for Cygwin differently than from Windows.
34672 git-gui: Implemented file browser and incremental blame.
34673 git-gui: Improve the icons used in the browser display.
34674 git-gui: Display the current branch name in browsers.
34675 git-gui: Allow users to edit user.name, user.email from options.
34676 git-gui: Use -M and -C when running blame.
34677 git-gui: Correctly handle spaces in filepaths.
34678 git-gui: Display original filename and line number in blame.
34679 git-gui: Install column headers in blame viewer.
34680 git-gui: Use a grid layout for the blame viewer.
34681 git-gui: Assign background colors to each blame hunk.
34682 Correct ^0 asciidoc syntax in fast-import docs.
34683 Correct some language in fast-import documentation.
34684 Correct spelling of fast-import in docs.
34685 tar archive frontend for fast-import.
34686 git-gui: Update known branches during rescan.
34687 git-gui: Support keyboard traversal in browser.
34688 git-gui: Replace \ with \\ when showing paths.
34689 git-gui: Refactor single_commit to a proc.
34690 git-gui: Separate transport/branch menus from multicommit.
34691 git-gui: Optionally save commit buffer on exit.
34692 git-gui: View blame from the command line.
34693 git-gui: Select subcommands like git does.
34694 git-gui: Relabel the Add All action.
34695 git-gui: Use git-config now over git-repo-config.
34696 git-gui: Redesign the display of annotated files.
34697 git-gui: Jump to the first annotation block as soon as its available.
34698 git-gui: Improve annotated file display.
34699 git-gui: Focus into blame panels on Mac OS.
34700 git-gui: Stop deleting gitk preferences.
34701 fast-import: Hide the pack boundary commits by default.
34702 fast-import: Add tip about importing renames.
34703 bash: Hide git-fast-import.
34704 fast-import: Support reusing 'from' and brown paper bag fix reset.
34705 git-gui: Allow gitexecdir, INSTALL to be set by the caller.
34706 git-gui: Rename GIT_VERSION to GITGUI_VERSION.
34707 git-gui: Generate a version file on demand.
34708 git-gui: Handle gitgui tags in version gen.
34709 git-gui: Guess our version accurately as a subproject.
34710 git-gui: Change base version to 0.6.
34711 Link git-gui into the master Makefile.
34714 Print a sane error message if an alias expands to an invalid git command
34715 Allow aliases to expand to shell commands
34718 Version v1.5.0-rc4; changes since v1.5.0-rc3:
34719 ---------------------------------------------
34722 Avoid ActiveState Perl IO in t800[12]
34725 doc: hooks.txt said post-commit default sends an email, it doesn't
34726 git-for-each-ref doesn't return "the bit after $GIT_DIR/refs"
34728 Aneesh Kumar K.V (1):
34729 blameview: Support browsable functionality to blameview.
34732 git-blame: an Emacs minor mode to view file with git-blame output.
34735 git-svn: do not let Git.pm warn if we prematurely close pipes
34736 Disallow invalid --pretty= abbreviations
34739 git-archimport: initial import needs empty directory
34741 Horst H. von Brand (1):
34742 Call make always with CFLAGS in git.spec
34744 Johannes Schindelin (4):
34745 Teach the '@{...}' notation to git-log -g
34746 Update the documentation for the new '@{...}' syntax
34747 Commands requiring a work tree must not run in GIT_DIR
34748 fast-import: Fix compile warnings
34750 Junio C Hamano (36):
34751 create_symref(): do not assume pathname from git_path() persists long enough
34752 detached HEAD -- finishing touches
34753 Use "git checkout -q" in git-bisect
34754 Tutorial: fix asciidoc formatting of "git add" section.
34755 Tutorial-2: Adjust git-status output to recent reality.
34756 core-tutorial: http reference link fix
34757 fix reflog entries for "git-branch"
34758 honor GIT_REFLOG_ACTION in git-commit
34759 Why is it bad to rewind a branch that has already been pushed out?
34760 combine-diff: special case --unified=0
34761 show-branch -g: default to the current branch.
34762 git-clone --reference: saner handling of borrowed symrefs.
34763 Revert "Allow branch.*.merge to talk about remote tracking branches."
34764 Rename get_ident() to fmt_ident() and make it available to outside
34765 t9200: Work around HFS+ issues.
34766 bisect: it needs to be done in a working tree.
34767 git-blame: no rev means start from the working tree file.
34768 Add pretend_sha1_file() interface.
34769 Use pretend_sha1_file() in git-blame and git-merge-recursive.
34770 blame: document --contents option
34771 Teach git-remote add to fetch and track
34772 Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
34773 gitk: Use show-ref instead of ls-remote
34774 git-push: allow globbing wildcard refspec.
34775 gitweb: fix mismatched parenthesis
34776 annotate: fix for cvsserver.
34778 Remove contrib/colordiff
34779 Add deprecation notices.
34780 Remove git-merge-recur
34781 git-clone --reference: work well with pack-ref'ed reference repository
34782 for-each-reflog: fix case for empty log directory
34783 t4200: skip gc-rerere test on systems with non GNU date.
34784 git-add -i: update removed path correctly.
34785 Documentation: Add gfi to the main command list.
34788 Linus Torvalds (2):
34789 pager: Work around window resizing bug in 'less'
34790 Fix "git log -z" behaviour
34793 gitk - remove trailing whitespace from a few lines.
34794 Make gitk work reasonably well on Cygwin.
34796 Michael Coleman (1):
34797 Fix some documentation typos and grammar
34799 Michele Ballabio (1):
34800 Documentation: add KMail in SubmittingPatches
34802 Nicolas Pitre (14):
34803 make reflog filename independent from struct ref_lock
34804 lock_ref_sha1_basic(): remember the original name of a ref when resolving it
34805 enable separate reflog for HEAD
34806 add reflog entries for HEAD when detached
34807 move create_symref() past log_ref_write()
34808 add logref support to git-symbolic-ref
34809 add reflog when moving HEAD to a new branch
34810 reword the detached head message a little again
34811 add a quiet option to git-checkout
34812 prevent HEAD reflog to be interpreted as current branch reflog
34813 provide a nice @{...} syntax to always mean the current branch reflog
34814 scan reflogs independently from refs
34815 Enable HEAD@{...} and make it independent from the current branch
34816 Let git-checkout always drop any detached head
34819 git-config --rename-section could rename wrong section
34820 Assorted typo fixes
34822 Robin Rosenberg (1):
34823 Why is it bad to rewind a branch that has already been pushed out?
34825 Shawn O. Pearce (113):
34826 Created fast-import, a tool to quickly generating a pack from blobs.
34827 Added automatic index generation to fast-import.
34828 Cleaned up memory allocation for object_entry structs.
34829 Refactored fast-import's internals for future additions.
34830 Added basic command handler to fast-import.
34831 Implemented branch handling and basic tree support in fast-import.
34832 Added tree and commit writing to fast-import.
34833 Implement blob ID validation in fast-import.
34834 Converted fast-import to a text based protocol.
34835 Changed fast-import's pack header creation to use pack.h
34836 Allow symlink blobs in trees during fast-import.
34837 Fixed segfault in fast-import after growing a tree.
34838 Converted fast-import to accept standard command line parameters.
34839 Added mark store/find to fast-import.
34840 Added branch load counter to fast-import.
34841 Implemented 'tag' command in fast-import.
34842 Implemented tree reloading in fast-import.
34843 Round out memory pool allocations in fast-import to pointer sizes.
34844 Remove branch creation command from fast-import.
34845 Moved from command to after data to help cvs2svn.
34846 Account for tree entry memory costs in fast-import.
34847 Added option to export the marks table when fast-import terminates.
34848 Added --branch-log to option to fast-import.
34849 Fixed GPF in fast-import caused by unterminated linked list.
34850 Fixed compile error in fast-import.
34851 Map only part of the generated pack file at any point in time.
34852 Added 'reset' command to clear a branch's tree.
34853 Don't crash fast-import if no branch log was requested.
34854 Converted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.
34855 Implemented tree delta compression in fast-import.
34856 Recycle data buffers for tree generation in fast-import.
34857 Reuse the same buffer for all commits/tags in fast-import.
34858 Replace ywrite in fast-import with the standard write_or_die.
34859 Correct tree corruption problems in fast-import.
34860 Additional fast-import tree delta corruption cleanups.
34861 Fix repository corruption when using marks for modified blobs.
34862 Support creation of merge commits in fast-import.
34863 Allow creating branches without committing in fast-import.
34864 Improve reuse of sha1_file library within fast-import.
34865 Misc. type cleanups within fast-import.
34866 Restructure fast-import to support creating multiple packfiles.
34867 Remove unnecessary duplicate_count in fast-import.
34868 Implemented manual packfile switching in fast-import.
34869 Don't create a final empty packfile in fast-import.
34870 Optimize index creation on large object sets in fast-import.
34871 Implemented automatic checkpoints within fast-import.
34872 Print the packfile names to stdout from fast-import.
34873 Corrected buffer overflow during automatic checkpoint in fast-import.
34874 Use uintmax_t for marks in fast-import.
34875 Replace redundant yread() with read_in_full() in fast-import.
34876 Reuse sha1 in packed_git in fast-import.
34877 Use .keep files in fast-import during processing.
34878 Ensure we close the packfile after creating it in fast-import.
34879 Remove unnecessary pack_fd global in fast-import.
34880 Correct max_packsize default in fast-import.
34881 Correct object_count type and stat output in fast-import.
34882 Print out the edge commits for each packfile in fast-import.
34883 Corrected BNF input documentation for fast-import.
34884 Correct a few types to be unsigned in fast-import.
34885 Declare no-arg functions as (void) in fast-import.
34886 Correct packfile edge output in fast-import.
34887 Always use struct pack_header for pack header in fast-import.
34888 Use fixed-size integers when writing out the index in fast-import.
34889 Remove unnecessary options from fast-import.
34890 Support delimited data regions in fast-import.
34891 Create test case for fast-import.
34892 Reduce value duplication in t9300-fast-import.
34893 Accept 'inline' file data in fast-import commit structure.
34894 Pull out remote listing functions in git-remote.
34895 Teach 'git remote' how to cleanup stale tracking branches.
34896 Cleanup prepare_packed_git_one to reuse install_packed_git.
34897 Correct comment in prepare_packed_git_one.
34898 Refactor open_packed_git to return an error code.
34899 Don't find objects in packs which aren't available anymore.
34900 Don't leak file descriptors from unavailable pack files.
34901 Cleanup subcommand documentation for git-remote.
34902 Keep untracked files not involved in a merge.
34903 Default GIT_MERGE_VERBOSITY to 5 during tests.
34904 bash: Remove short option completions for branch/checkout/diff.
34905 bash: Classify cat-file and reflog as plumbing.
34906 bash: Complete long options to git-add.
34907 bash: Add space after unique command name is completed.
34908 bash: Classify more commends out of completion.
34909 bash: Support unique completion on git-config.
34910 bash: Support unique completion when possible.
34911 bash: Support internal revlist options better.
34912 Include checkpoint command in the BNF.
34913 Reduce memory usage of fast-import.
34914 Show an example of deleting commits with git-rebase.
34915 bash: Support completion on git-cherry.
34916 bash: Hide diff-stages from completion.
34917 bash: Offer --prune completion for git-gc.
34918 bash: Hide git-resolve, its deprecated.
34919 bash: Support --add completion to git-config.
34920 bash: Support git-bisect and its subcommands.
34921 Don't support shell-quoted refnames in fast-import.
34922 Initial draft of fast-import documentation.
34923 bash: Support git-rebase -m continuation completion.
34924 bash: Complete git-remote subcommands.
34925 Remove --branch-log from fast-import.
34926 Correct compiler warnings in fast-import.
34927 Correct minor style issue in fast-import.
34928 Correct fast-import timezone documentation.
34929 Remove unnecessary null pointer checks in fast-import.
34930 Minor fast-import documentation corrections.
34931 Support RFC 2822 date parsing in fast-import.
34932 Don't do non-fastforward updates in fast-import.
34933 Minor timestamp related documentation corrections for fast-import.
34934 Teach fast-import how to clear the internal branch content.
34935 Teach fast-import how to sit quietly in the corner.
34936 Dump all refs and marks during a checkpoint in fast-import.
34937 Don't crash fast-import if the marks cannot be exported.
34938 Add a Tips and Tricks section to fast-import's manual.
34940 Simon 'corecode' Schubert (1):
34941 Allow forcing of a parent commit, even if the parent is not a direct one.
34944 Add hg-to-git conversion utility.
34946 Uwe Kleine-König (1):
34947 add replay and log to the usage string of git-bisect
34950 gitweb: Convert project name to UTF-8
34953 Version v1.5.0-rc3; changes since v1.5.0-rc2:
34954 ---------------------------------------------
34957 Insert ACTIVESTATE_STRING in Git.pm
34958 Force Activestate Perl to tie git command pipe handle to a handle class
34959 Cleanup uninitialized value in chomp
34960 Allow default core.logallrefupdates to be overridden with template's config
34961 Fix git-update-index to work with relative pathnames.
34963 Alexandre Julliard (1):
34964 vc-git.el: Take into account the destination name in vc-checkout.
34967 New files in git weren't being downloaded during CVS update
34968 If abbrev is set to zero in git-describe, don't add the unique suffix
34969 Allow the tag signing key to be specified in the config file
34970 UNIX reference time of 1970-01-01 00:00 is UTC timezone, not local time zone
34971 Heavily expanded update hook to send more useful emails than the old hook
34973 Aneesh Kumar K.V (2):
34974 blameview: Use git-cat-file to read the file content.
34975 Update git-cat-file documentation
34978 Document --check option to git diff.
34981 Improved error message from git-rebase
34984 git-svn: remove leading slash when printing removed directories
34986 J. Bruce Fields (31):
34987 Documentation: add git user's manual
34988 Documentation: expand preface and todo's
34989 Documentation: git-rebase discussion, miscellaneous user-manual updates
34990 Documentation: more user-manual todo's
34991 Documentation: reorder development section, todo's
34992 Documentation: begin discussion of git-remote in user manual
34993 Documentation: rev-list -> rev-parse, other typos, start examples
34994 user manual: answer some comments from Junio
34995 user-manual: replace init-db by init
34996 user-manual: reindent
34997 user-manual: rewrap, fix heading levels
34998 user-manual: add "quick start" as chapter 1
34999 user-manual: minor quickstart reorganization
35000 user-manual: clarify difference between tag and branch
35001 user-manual: update references discussion
35002 user-manual: update git-gc discussion
35003 user-manual: stub discussion of fsck and reflog
35004 user-manual: reorganize fetch discussion, add internals, etc.
35005 user-manual: git-fsck, dangling objects
35006 user-manual: fsck-objects -> fsck
35007 user-manual: repo-config -> config
35008 user-manual: add references to git-config man page
35009 user-manual: typo fix
35010 user-manual: fix a header level
35011 user-manual: reflogs, other recovery
35012 user-manual: rewrap a few long lines
35013 user-manual: minor "TODO" updates
35014 user-manual: document git-show-branch example
35015 user-manual: SHA1 -> object name
35016 user-manual: point to README for gitweb information
35017 user-manual: todo's
35019 Jakub Narębski (3):
35020 Documentation/config.txt: Document config file syntax better
35021 t/t1300-repo-config.sh: value continued on next line
35022 Documentation/config.txt: Correct info about subsection name
35025 Use inttypes.h rather than stdint.h.
35028 format-patch: fix bug with --stdout in a subdirectory
35029 contrib/vim: update syntax for changed commit template
35030 diffcore-pickaxe: fix infinite loop on zero-length needle
35031 Add a sample program 'blameview' to show how to use git-blame --incremental
35033 Johannes Schindelin (2):
35034 annotate: use pager
35035 reflog inspection: introduce shortcut "-g"
35038 Add a missing fork() error check.
35040 Junio C Hamano (43):
35041 User manual: fix typos in examples
35042 Documentation/tutorial-2: Fix interesting typo in an example.
35043 Revert "prune: --grace=time"
35044 Make sure git_connect() always give two file descriptors.
35045 is_repository_shallow(): prototype fix.
35046 shallow repository: disable unsupported operations for now.
35047 git-gc: do not run git-prune by default.
35048 cvsimport: activate -a option, really.
35049 .mailmap: fix screw-ups in Uwe's name
35050 honor --author even with --amend, -C, and -c.
35051 reflog gc: a tag that does not point at a commit is not a crime.
35052 git-checkout -m: fix merge case
35053 git-daemon documentation on enabling services.
35054 ls-remote and clone: accept --upload-pack=<path> as well.
35055 Refactor the pack header reading function out of receive-pack.c
35056 Allow fetch-pack to decide keeping the fetched pack without exploding
35057 fetch-pack: remove --keep-auto and make it the default.
35058 Consolidate {receive,fetch}.unpackLimit
35059 Allow non-developer to clone, checkout and fetch more easily.
35060 parse-remote: do not barf on a remote shorthand without any refs to fetch.
35061 show-branch -g: default to HEAD
35062 Documentation: pack-refs --all vs default behaviour
35063 Make sure we do not write bogus reflog entries.
35064 git-merge: leave sensible reflog message when used as the first level UI.
35065 create_symref: check error return from open().
35066 write_in_full: size_t is unsigned.
35067 Don't force everybody to call setup_ident().
35068 git-blame --porcelain: quote filename in c-style when needed.
35069 Update describe documentation.
35070 Document 'git-blame --incremental'
35071 git-fsck-objects is now synonym to git-fsck
35072 Two small typofixes.
35073 lock_any_ref_for_update(): do not accept malformatted refs.
35074 git-commit -s: no extra space when sign-offs appear at the end already.
35075 git-blame: somewhat better commenting.
35076 git-send-email: remove debugging output.
35078 Documentation: "git-checkout <tree> <path>" takes any tree-ish
35079 t9200: Re-code non-ascii path test in UTF-8
35080 t9200: do not test -x bit if the filesystem does not support it.
35081 git main documentation: point at the user's manual.
35082 Do not use hardcoded path to xhmtl.xsl to generate user's manual
35085 Linus Torvalds (5):
35086 fsck-objects: refactor checking for connectivity
35087 Fix seriously broken "git pack-refs"
35088 Add dangling objects tips.
35089 git-blame --incremental
35090 git-push through git protocol
35093 wt-status: Actually accept `color.status.BLAH' configuration variables.
35094 Documentation/config.txt: Fix documentation of colour config tweaks.
35095 Make fsck and fsck-objects be builtins.
35098 fix suggested branch creation command when detaching head
35099 git-log -g --pretty=oneline should display the reflog message
35100 tone down the detached head warning
35103 sha1_file.c: Avoid multiple calls to find_pack_entry().
35104 Documentation: --amend cannot be combined with -c/-C/-F.
35107 git-blame --incremental: don't use pager
35110 contrib/emacs/vc-git.el: support vc-version-other-window
35113 git-fetch: Allow fetching the remote HEAD
35115 Shawn O. Pearce (6):
35116 Remove unnecessary found variable from describe.
35117 Teach git-describe to display distances from tags.
35118 Compute accurate distances in git-describe before output.
35119 Teach for-each-ref about a little language called Tcl.
35120 Don't coredump on bad refs in update-server-info.
35121 Escape --upload-pack from expr.
35123 Simon 'corecode' Schubert (1):
35124 Replace perl code with pure shell code
35127 Rename git-repo-config to git-config.
35129 Uwe Kleine-König (2):
35130 rename --exec to --upload-pack for fetch-pack and peek-remote
35131 make --upload-pack option to git-fetch configurable
35134 Version v1.5.0-rc2; changes since v1.5.0-rc1:
35135 ---------------------------------------------
35138 git-revert: Fix die before git-sh-setup defines it.
35140 Chris Wedgwood (1):
35141 cache.h; fix a couple of prototypes
35144 Shell syntax fix in git-reset
35145 Document --ignore-if-in-upstream in git-format-patch
35148 gitk: add current directory to main window title
35151 git-svn: fix tests to work with older svn
35152 git-svn: print and flush authentication prompts to STDERR
35155 Start all test scripts with /bin/sh.
35156 Set _ALL_SOURCE for AIX, but avoid its struct list.
35157 Replace "echo -n" with printf in shell scripts.
35158 Solaris 5.8 returns ENOTDIR for inappropriate renames.
35161 git-pull: disallow implicit merging to detached HEAD
35163 Johannes Schindelin (9):
35164 Fix spurious compile error
35165 config_set_multivar(): disallow newlines in keys
35166 show_date(): fix relative dates
35167 apply --cached: fix crash in subdirectory
35168 Do not verify filenames in a bare repository
35169 Teach the revision walker to walk by reflogs with --walk-reflogs
35170 --walk-reflogs: disallow uninteresting commits
35171 --walk-reflogs: actually find the right commit by date.
35172 --walk-reflogs: do not crash with cyclic reflog ancestry
35174 Junio C Hamano (69):
35175 reflog-expire: brown paper bag fix.
35176 merge-recursive: do not report the resulting tree object name
35177 Explain "Not a git repository: '.git'".
35179 Make git-prune-packed a bit more chatty.
35180 Define cd_to_toplevel shell function in git-sh-setup
35181 Use cd_to_toplevel in scripts that implement it by hand.
35182 Allow whole-tree operations to be started from a subdirectory
35183 Use log output encoding in --pretty=email headers.
35184 t3901: test "format-patch | am" pipe with i18n
35185 git-commit documentation: -a adds and also removes
35186 Consistent message encoding while reusing log from an existing commit.
35187 More tests in t3901.
35188 git log documentation: teach -<n> form.
35190 Documentation: merge-output is not too verbose now.
35191 Use merge-recursive in git-revert/git-cherry-pick
35192 git reflog expire: document --stale-fix option.
35193 Fix git-fetch while on detached HEAD not to give needlessly alarming errors
35194 git-push documentation: remaining bits
35195 git-rm documentation: remove broken behaviour from the example.
35196 tutorial: shorthand for remotes but show distributed nature of git
35197 git-commit documentation: remove comment on unfixed git-rm
35198 Use merge-recursive in git-checkout -m (branch switching)
35199 Document where configuration files are in config.txt
35200 git-commit: document log message formatting convention
35201 Documentation/SubmittingPatches: Gnus tips
35202 Documentation/git-tag: the command can be used to also verify a tag.
35203 Documentation/git-tools.txt: mention tig and refer to wiki
35204 Documentation/git-tar-tree.txt: default umask is now 002
35205 Documentation/git-status.txt: mention color configuration
35206 Documentation/git-whatchanged.txt: show -<n> instead of --max-count.
35207 Documentation/git-sh-setup.txt: programmer's docs
35208 Documentation: detached HEAD
35209 Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"
35210 Documentation: describe shallow repository
35211 Documentation/glossary.txt: unpacked objects are loose.
35212 Documentation/glossary.txt: describe remotes/ tracking and packed-refs
35213 Introduce 'git-format-patch --suffix=.patch'
35214 git-format-patch: do not crash with format.headers without value.
35215 Documentation/git-resolve: deprecated.
35216 Documentation: suggest corresponding Porcelain-level in plumbing docs.
35217 Documentation: m can be relative in "git-blame -Ln,m"
35218 Documentation/git-parse-remote.txt: we deal with config vars as well
35219 git-format-patch -3
35220 Add --summary to git-format-patch by default
35221 git-format-patch: make --binary on by default
35222 git-format-patch: the default suffix is now .patch, not .txt
35223 Use fixed-size integers for .idx file I/O
35224 Documentation: move command list in git.txt into separate files.
35225 Documentation: sync git.txt command list and manual page title
35226 Documentation: Generate command lists.
35227 for_each_reflog_ent: do not leak FILE *
35228 refs.c::read_ref_at(): fix bogus munmap() call.
35229 Documentation: generated cmds-*.txt does not depend on git.txt
35230 Documentation/git.txt: command re-classification
35231 dwim_ref(): Separate name-to-ref DWIM code out.
35232 Extend read_ref_at() to be usable from places other than sha1_name.
35233 show-branch --reflog: show the reflog message at the top.
35234 show-branch --reflog: tighten input validation.
35235 show-branch --reflog: fix show_date() call
35236 Stop ignoring Documentation/README
35237 git-tag -d: allow deleting multiple tags at once.
35238 branch -f: no reason to forbid updating the current branch in a bare repo.
35239 git-rebase: allow rebasing a detached HEAD.
35240 log --walk-reflog: documentation
35241 reflog-walk: build fixes
35242 Fix --walk-reflog with --pretty=oneline
35245 Linus Torvalds (2):
35246 Clean up write_in_full() users
35247 Fix up totally buggered read_or_die()
35249 Matthias Lederhofer (2):
35250 prune-packed: add -q to usage
35251 prune: --grace=time
35253 Michael S. Tsirkin (1):
35254 fix documentation for git-commit --no-verify
35257 use 'init' instead of 'init-db' for shipped docs and tools
35258 simplify the "no changes added to commit" message
35260 sanitize content of README file
35263 Make gitk work when launched in a subdirectory
35266 git-remote: no longer silent on unknown commands.
35269 Documentation: a few spelling fixes
35272 tutorial: Use only separate layout
35274 Shawn O. Pearce (18):
35275 Improve merge performance by avoiding in-index merges.
35276 Hide output about SVN::Core not being found during tests.
35277 Remove read_or_die in favor of better error messages.
35278 Remove unnecessary call_depth parameter in merge-recursive.
35279 Allow the user to control the verbosity of merge-recursive.
35280 Enable output buffering in merge-recursive.
35281 Display a progress meter during merge-recursive.
35282 Convert output messages in merge-recursive to past tense.
35283 Always perfer annotated tags in git-describe.
35284 Hash tags by commit SHA1 in git-describe.
35285 Use binary searching on large buckets in git-describe.
35286 Improve git-describe performance by reducing revision listing.
35287 Correct priority of lightweight tags in git-describe.
35288 Remove hash in git-describe in favor of util slot.
35289 Use nice names in conflict markers during cherry-pick/revert.
35290 Document the master@{n} reflog query syntax.
35291 Refer users to git-rev-parse for revision specification syntax.
35292 Document pack .idx file format upgrade strategy.
35294 Simon 'corecode' Schubert (2):
35295 Use fixed-size integers for the on-disk pack structure.
35296 Use standard -t option for touch.
35298 Uwe Kleine-König (4):
35299 document --exec for git-push
35300 Update documentation of fetch-pack, push and send-pack
35301 make --exec=... option to git-push configurable
35302 rename --exec to --receive-pack for push and send-pack
35305 Version v1.5.0-rc1; changes since v1.5.0-rc0:
35306 ---------------------------------------------
35309 Speed-up recursive by flushing index only once for all entries
35311 Alexandre Julliard (12):
35312 Shallow clone: do not ignore shallowness when following tags
35313 fetch-pack: Properly remove the shallow file when it becomes empty.
35314 upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
35315 git-fetch: Reset shallow_depth before auto-following tags.
35316 get_shallow_commits: Avoid memory leak if a commit has been reached already.
35317 fetch-pack: Do not fetch tags for shallow clones.
35318 git-clean: Fix the -q option.
35319 git.el: Don't use --info-only when resolving a file.
35320 git.el: Avoid setting font lock keywords before entering log-edit mode.
35321 git-apply: Remove directories that have become empty after deleting a file.
35322 git-clone: Make sure the master branch exists before running cat on it.
35323 git.el: Define the propertize function if needed, for XEmacs compatibility.
35326 hooks/commit-msg: add example to add Signed-off-by line to message
35328 Andy Whitcroft (6):
35329 send pack check for failure to send revisions list
35330 ssh-upload: prevent buffer overrun
35331 short i/o: clean up the naming for the write_{in,or}_xxx family
35332 short i/o: fix calls to read to use xread or read_in_full
35333 short i/o: fix calls to write to use xwrite or write_in_full
35334 short i/o: fix config updates to use write_in_full
35336 Brian Gernhardt (3):
35337 Add documentation for git-branch's color configuration.
35338 Ignore git-init and git-remote
35339 Auto-quote config values in config.c:store_write_pair()
35342 git-svn: quiet down tests and fix some unportable shell constructs
35343 git-svn: dcommit should diff against the current HEAD after committing
35344 t6024-recursive-merge: quiet down this test
35345 test-lib: quiet down init-db output for tests
35346 t9200-git-cvsexportcommit.sh: quiet down commit
35347 git-svn: remove non-delta fetch code paths
35348 git-svn: print out the SVN library version in --version, too
35349 git-svn: verify_ref() should actually --verify
35350 git-svn: sort multi-init output
35351 git-svn: remove svnadmin dependency from the tests
35352 git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
35353 git-svn: t/t91??-*: optimize the tests a bit
35354 instaweb: load Apache mime and dir modules if they are needed
35355 git-svn: make multi-init less confusing
35356 git-svn: update documentation for multi-{init|fetch}
35357 git-svn: make --repack work consistently between fetch and multi-fetch
35358 Documentation/git-svn: clarify dcommit, rebase vs pull/merge
35359 git-svn: fix show-ignore
35360 git-svn: add --prefix= option to multi-init
35361 git-svn: pass an unambiguous ref to rev-list when grafting-branches
35362 Avoid errors and warnings when attempting to do I/O on zero bytes
35364 Fredrik Kuivinen (1):
35365 instaweb: Nicer error message when the http daemon isn't found
35367 J. Bruce Fields (9):
35368 Docs: update cvs-migration.txt to reflect clone's new default behavior
35369 Documentation: update git-clone.txt for clone's new default behavior
35370 Documentation: update glossary entry for "origin"
35371 Documentation: update tutorial's discussion of origin
35372 Documentation: update git-pull.txt for new clone behavior
35373 Documentation: remove master:origin example from pull-fetch-param.txt
35374 Documentation: tutorial editing
35375 Documentation: clarify definition of "reachable"
35376 Documentation: add git-remote man page
35378 Jakub Narębski (14):
35379 gitweb: Add mod_perl version string to "generator" meta header
35380 gitweb: Precompile CGI routines for mod_perl
35381 Add info about new test families (8 and 9) to t/README
35382 gitweb: Fix error in git_project_index subroutine
35383 gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')
35384 gitweb: There can be empty patches (in git_patchset_body)
35385 gitweb: Fix "Use of uninitialized value" warning in git_tags_body
35386 gitweb: Fix error in git_patchest_body for file creation/deletion patch
35387 gitweb: Fix error in "rename to"/"copy to" git diff header output
35388 gitweb: Fix errors in git_patchset_body for empty patches
35389 Revert "gitweb: There can be empty patches (in git_patchset_body)"
35390 gitweb: Fix split patches output (e.g. file to symlink)
35391 gitweb: Remove superfluous "|" in "commit" view
35392 gitweb: Fix git_patchset_body not closing <div class="patch">
35395 get_tree_entry: map blank requested entry to tree root
35398 update hook: redirect _both_ diagnostic lines to stderr upon tag failure
35400 Johannes Schindelin (9):
35401 upload-pack: no longer call rev-list
35402 support fetching into a shallow repository
35403 allow cloning a repository "shallowly"
35404 allow deepening of a shallow repository
35405 add tests for shallow stuff
35406 xdl_merge(): fix a segmentation fault when refining conflicts
35407 Fix yet another subtle xdl_merge() bug
35408 Sanitize for_each_reflog_ent()
35409 Fix t1410 for core.filemode==false
35411 Junio C Hamano (106):
35412 We should make sure that the protocol is still extensible.
35413 Why does it mean we do not have to register shallow if we have one?
35414 Why didn't we mark want_obj as ~UNINTERESTING in the old code?
35415 shallow clone: unparse and reparse an unshallowed commit
35416 add for_each_reflog_ent() iterator
35417 Protect commits recorded in reflog from pruning.
35418 Teach git-repack to preserve objects referred to by reflog entries.
35419 reflog: fix warning message.
35420 Move in_merge_bases() to commit.c
35422 reflog expire: prune commits that are not incomplete
35423 reflog expire: do not punt on tags that point at non commits.
35424 show-branch --reflog: add documentation.
35425 Document --numstat in git-apply and git-diff
35426 Document git-reset <commit> -- <paths>...
35427 Move encoding conversion routine out of mailinfo to utf8.c
35428 i18n.logToUTF8: convert commit log message to UTF-8
35429 Teach log family --encoding
35430 everyday: update for v1.5.0
35431 count-objects -v: show number of packs as well.
35432 rerere gc: honor configuration and document it
35433 git-reflog: gc.* configuration and documentation.
35434 everyday: replace a few 'prune' and 'repack' with 'gc'
35435 Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
35436 Set NO_MMAP for Cygwin by default
35437 UTF-8: introduce i18n.logoutputencoding.
35438 gcc does not necessarily pass runtime libpath with -R
35439 Work around http-fetch built with cURL 7.16.0
35440 Rename t3900 test vector file
35441 t3900: test conversion to non UTF-8 as well
35442 GIT_SKIP_TESTS: allow users to omit tests that are known to break
35443 core.logallrefupdates: log remotes/ tracking branches.
35444 Allow non-fast-forward of remote tracking branches in default clone
35445 t5400 send-pack test: try a bit more nontrivial transfer.
35446 Revert "read_directory: show_both option."
35447 Fix 'git add' with .gitignore
35448 pack-objects: fix use of use_pack().
35449 mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
35450 send-pack: fix pipeline.
35451 Documentation: illustrate send-pack pipeline.
35452 commit re-encoding: fix confusion between no and default conversion.
35453 t3900: test log --encoding=none
35454 Documentation: i18n commit log message notes.
35455 Documentation: minor rewording for git-log and git-show pages.
35456 Move commit reencoding parameter parsing to revision.c
35457 commit-tree: cope with different ways "utf-8" can be spelled.
35458 i18n: drop "encoding" header in the output after re-coding.
35459 Documentation/config.txt (and repo-config manpage): mark-up fix.
35460 Update documentation for update hook.
35461 send-pack.c: use is_null_sha1()
35462 send-pack: tell pack-objects to use its internal rev-list.
35463 Do not merge random set of refs out of wildcarded refs
35464 i18n: do not leak 'encoding' header even when we cheat the conversion.
35465 Update send-pack pipeline documentation.
35466 fail pull/merge early in the middle of conflicted merge
35467 git-fetch: remove .keep file at the end.
35468 Strongly discourage --update-head-ok in fetch-options documentation.
35469 Update clone/fetch documentation with --depth (shallow clone) option
35470 Remove unused variable (git-commit.sh)
35471 fetch-pack: do not use lockfile structure on stack.
35472 Fix infinite loop when deleting multiple packed refs.
35473 tutorial: misc updates.
35474 git-verify-tag: make sure we remove temporary file.
35475 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
35476 rerere: Fix removal of already resolved path.
35478 builtin-prune: memory diet.
35479 Fix timestamp for test-tick
35480 builtin-prune: make file-scope static struct to an argument.
35481 builtin-prune: separate ref walking from reflog walking.
35482 Move traversal of reachable objects into a separate library.
35483 reflog expire --fix-stale
35484 reflog --fix-stale: do not check the same trees and commits repeatedly.
35485 diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
35486 git-reset <tree> -- <path> restores absense of <path> in <tree>
35487 Spell default packedgitlimit slightly differently
35488 Move initialization of log_all_ref_updates
35489 Introduce is_bare_repository() and core.bare configuration variable
35490 git-fetch: allow updating the current branch in a bare repository.
35491 git-status: show detached HEAD
35492 Detached HEAD (experimental)
35493 git-checkout: do not warn detaching HEAD when it is already detached.
35494 git-checkout: rewording comments regarding detached HEAD.
35495 git-checkout: safety when coming back from the detached HEAD state.
35496 git-checkout: fix branch name output from the command
35497 --utf8 is now default for 'git-am'
35498 --prune is now default for 'pack-refs'
35499 rm git-rerere.perl -- it is now a built-in.
35500 merge-base: do not leak commit list
35501 Do not ignore a detected patchfile brokenness.
35502 Fix "Do not ignore a detected patchfile brokenness."
35503 builtin-archive: do not free a tree held by the object layer.
35504 git-checkout: safety check for detached HEAD checks existing refs
35505 git-checkout: handle local changes sanely when detaching HEAD
35506 git-am: should work when "--no-utf8 --utf8" is given
35507 -u is now default for 'git-applymbox'
35508 -u is now default for 'git-mailinfo'.
35509 Makefile: remove $foo when $foo.exe is built/installed.
35510 merge-recursive: do not use on-file index when not needed.
35512 index-pack: write-or-die instead of unchecked write-in-full.
35513 config-set: check write-in-full returns in set_multivar
35514 git-rm: do not fail on already removed file.
35515 git-status: wording update to deal with deleted files.
35516 plug a few leaks in revision walking used in describe.
35520 Clarify syntax and role of git-add in status output
35521 Improve "nothing to commit" part of status output
35522 Support --amend on initial commit in status output
35523 Improve cached content header of status output
35524 Remove unnecessary git-rm --cached reference from status output
35525 send-email: work around double encoding of in-body From field.
35526 Provide better feedback for the untracked only case in status output
35529 Skip excessive blank lines before commit body
35530 Refactor print-functions in builtin-branch
35531 git-branch: show detached HEAD
35533 Linus Torvalds (3):
35534 write-cache: do not leak the serialized cache-tree data.
35535 write_in_full: really write in full or return error on disk full.
35536 Better error messages for corrupt databases
35539 Blame "linenr" link jumps to previous state at "orig_lineno"
35541 Martin Langhoff (6):
35542 cvsimport: skip commits that are too recent
35543 cvsimport: skip commits that are too recent (option and documentation)
35544 cvsimport: document -S and -L options
35545 cvsimport: cleanup temporary cvsps file
35546 cvsserver: detect early of we are up to date and avoid costly rev-list
35547 cvsserver: fix revision number during file adds
35549 Michael Loeffler (1):
35550 git-commit: do not fail to print the diffstat even if there is a file named HEAD
35553 add .mailmap for git-shortlog output with the git repository
35554 Add git-reflog to .gitignore
35555 move git-blame to its place in .gitignore
35556 "init-db" can really be just "init"
35557 Add git-init documentation.
35560 Fix warnings in sha1_file.c - use C99 printf format if available
35563 git-send-email: default value for "From:" field.
35566 Make check target depend on common-cmds.h
35567 Remove shadowing variable from traverse_trees()
35568 Set default "tar" umask to 002 and owner.group to root.root
35570 Robert Fitzsimons (2):
35571 gitweb: Re-enable rev-list --parents for parse_commit.
35572 gitweb: Fix shortlog only showing HEAD revision.
35575 Documentation/tutorial: misc updates
35576 git-tag: add flag to verify a tag
35578 Sasha Khapyorsky (3):
35579 git-svnimport: support for incremental import
35580 git-svnimport: clean svn path when accessing SVN repo
35581 git-svnimport: fix edge revisions double importing
35583 Shawn O. Pearce (49):
35584 Don't crash during repack of a reflog with pruned commits.
35585 Create 'git gc' to perform common maintenance operations.
35586 Use GIT_REFLOG_ACTION environment variable instead.
35587 Honor GIT_REFLOG_ACTION in git-rebase.
35588 Use branch names in 'git-rebase -m' conflict hunks.
35589 Ensure `git-pull` fails if `git-merge` fails.
35590 Honor pull.{twohead,octopus} in git-merge.
35591 Allow git-merge to select the default strategy.
35592 Move better_branch_name above get_ref in merge-recursive.
35593 Allow merging bare trees in merge-recursive.
35594 Use merge-recursive in git-am -3.
35595 Replace unpack_entry_gently with unpack_entry.
35596 Introduce new config option for mmap limit.
35597 Refactor packed_git to prepare for sliding mmap windows.
35598 Use off_t for index and pack file lengths.
35599 Create read_or_die utility routine.
35600 Refactor how we open pack files to prepare for multiple windows.
35601 Replace use_packed_git with window cursors.
35602 Loop over pack_windows when inflating/accessing data.
35603 Document why header parsing won't exceed a window.
35604 Unmap individual windows rather than entire files.
35605 Fully activate the sliding window pack access.
35606 Load core configuration in git-verify-pack.
35607 Ensure core.packedGitWindowSize cannot be less than 2 pages.
35608 Improve error message when packfile mmap fails.
35609 Support unmapping windows on 'temporary' packfiles.
35610 Create pack_report() as a debugging aid.
35611 Test suite for sliding window mmap implementation.
35612 Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
35613 Release pack windows before reporting out of memory.
35614 Replace mmap with xmmap, better handling MAP_FAILED.
35615 Cleanup read_cache_from error handling.
35616 Fix random segfaults in pack-objects.
35617 Force core.filemode to false on Cygwin.
35618 Use PATH_MAX constant for --bare.
35619 Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
35620 Automatically detect a bare git repository.
35621 Remove unnecessary argc parameter from run_command_v.
35622 Redirect update hook stdout to stderr.
35623 Use /dev/null for update hook stdin.
35624 Teach Git how to parse standard power of 2 suffixes.
35625 Update packedGit config option documentation.
35626 Add test case for update hooks in receive-pack.
35627 Increase packedGit{Limit,WindowSize} on 64 bit systems.
35628 Don't die in git-http-fetch when fetching packs.
35629 Don't save the commit buffer in git-describe.
35630 Make git-describe a builtin.
35631 Disallow working directory commands in a bare repository.
35632 Chose better tag names in git-describe after merges.
35634 Stefan-W. Hahn (1):
35635 Replacing the system call pread() with lseek()/xread()/lseek() sequence.
35638 Describe git-clone's actual behavior in the summary
35639 Print a more accurate error message when we fail to create a lock file.
35640 Update git-svn manpage to remove the implication that SVN::* is optional.
35643 Fix formatting for urls section of fetch, pull, and push manpages
35644 Fix formatting for urls section of fetch, pull, and push manpages
35647 Version v1.5.0-rc0; changes since v1.4.4.5:
35648 -------------------------------------------
35651 Make perl/ build procedure ActiveState friendly.
35653 Alexandre Julliard (1):
35654 vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.
35656 Andreas Ericsson (2):
35657 ls-files: Give hints when errors happen.
35658 git-diff: Introduce --index and deprecate --cached.
35661 Improve git-prune -n output
35662 Add support to git-branch to show local and remote branches
35663 Use .git/config for storing "origin" shortcut repository
35664 De-emphasise the symbolic link documentation.
35665 Explicitly add the default "git pull" behaviour to .git/config on clone
35666 Colourise git-branch output
35667 Allow subcommand.color and color.subcommand color configuration
35668 git-status always says what branch it's on
35670 Aneesh Kumar K.V (1):
35671 Add config example with respect to branch
35673 Brian Gernhardt (6):
35674 Add --add option to git-repo-config
35675 Make git-diff documentation use [--] when it should.
35676 Add documentation for show-branch --topics
35677 Remove COLLISION_CHECK from Makefile since it's not used.
35678 Keep "git --git-dir" from causing a bus error.
35679 Make git-show-branch options similar to git-branch.
35681 David S. Miller (1):
35682 Pass -M to diff in request-pull
35685 git-svn: handle authentication without relying on cached tokens on disk
35686 git-svn: correctly access repos when only given partial read permissions
35687 git-svn: exit with status 1 for test failures
35688 git-svn: allow SVN:: lib users to track the root of the repository (again)
35689 git-svn: use ~/.subversion config files when using SVN:: libraries
35690 git-svn: enable delta transfers during fetches when using SVN:: libs
35691 git-svn: update tests for recent changes
35692 git-svn: error out when the SVN connection fails during a fetch
35693 git-svn: fix output reporting from the delta fetcher
35694 git-svn: color support for the log command
35695 git-svn: documentation updates
35696 git-svn: fix multi-init
35697 git-svn: avoid network timeouts for long-running fetches
35698 git-svn: extra error check to ensure we open a file correctly
35699 git-svn: use do_switch for --follow-parent if the SVN library supports it
35700 rerere: add clear, diff, and status commands
35701 rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
35702 git-svn: enable logging of information not supported by git
35703 git-svn: allow dcommit to take an alternate head
35704 git-svn: correctly display fatal() error messages
35705 git-svn: correctly handle packed-refs in refs/remotes/
35706 git-svn: correctly handle "(no author)" when using an authors file
35707 git-svn: convert to using Git.pm
35708 git-svn: remove support for the svn command-line client
35709 git-svn: rename 'commit' command to 'set-tree'
35710 git-cvsserver: fix breakage when calling git merge-file
35711 Remove NO_ACCURATE_DIFF options from build systems
35712 git-svn: enable common fetch/commit options for dcommit
35713 Makefile: add quick-install-doc for installing pre-built manpages
35715 Han-Wen Nienhuys (2):
35716 git-tag: allow empty tag message if -m is given explicitly.
35717 ident.c: Trim hint printed when gecos is empty.
35720 git-cvsimport: add support for CVS pserver method HTTP/1.x proxying
35722 J. Bruce Fields (5):
35723 Documentation: clarify tutorial pull/merge discussion
35724 cvs-migration: improved section titles, better push/commit explanation
35725 Documentation: reorganize cvs-migration.txt
35726 Documentation: update git-clone man page with new behavior
35727 Documentation: simpler shared repository creation
35729 Jakub Narębski (26):
35730 gitweb: Protect against possible warning in git_commitdiff
35731 gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring
35732 gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"
35733 gitweb: New improved formatting of chunk header in diff
35734 gitweb: Add an option to href() to return full URL
35735 gitweb: Refactor feed generation, make output prettier, add Atom feed
35736 gitweb: Finish restoring "blob" links in git_difftree_body
35737 gitweb: Replace SPC with also in tag comment
35738 gitweb: Do not use esc_html in esc_path
35739 gitweb: Use git-show-ref instead of git-peek-remote
35740 gitweb: Add author and committer email extraction to parse_commit
35741 gitweb: Add author and contributor email to Atom feed
35742 gitweb: Use author_epoch for pubdate in gitweb feeds
35743 gitweb: Make project description in projects list link to summary view
35744 gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
35745 git-clone: Rename --use-immingled-remote option to --no-separate-remote
35746 Document git-diff whitespace flags -b and -w
35747 gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
35748 gitweb: Don't use Content-Encoding: header in git_snapshot
35749 gitweb: Show target of symbolic link in "tree" view
35750 gitweb: Add generic git_object subroutine to display object of any type
35751 gitweb: Hyperlink target of symbolic link in "tree" view (if possible)
35752 gitweb: SHA-1 in commit log message links to "object" view
35753 gitweb: Do not show difftree for merges in "commit" view
35754 gitweb: Add title attribute to ref marker with full ref name
35755 gitweb: Add "next" link to commit view
35758 shortlog: fix segfault on empty authorname
35759 vim syntax: follow recent changes to commit template
35762 Set permissions of each new file before "cvs add"ing it.
35764 Johannes Schindelin (30):
35766 shortlog: do not crash on parsing "[PATCH"
35767 shortlog: read mailmap from ./.mailmap again
35768 shortlog: handle email addresses case-insensitively
35770 shortlog: use pager
35771 sha1_object_info(): be consistent with read_sha1_file()
35772 xdiff: add xdl_merge()
35773 xdl_merge(): fix an off-by-one bug
35774 xdl_merge(): fix thinko
35775 diff -b: ignore whitespace at end of line
35776 xdl_merge(): fix and simplify conflict handling
35777 cvs-migration document: make the need for "push" more obvious
35778 Add builtin merge-file, a minimal replacement for RCS merge
35779 merge-file: support -p and -q; fix compile warnings
35780 Get rid of the dependency on RCS' merge program
35781 merge-recursive: add/add really is modify/modify with an empty base
35782 INSTALL: no need to have GNU diff installed
35783 git-show: grok blobs, trees and tags, too
35784 Document git-merge-file
35785 add a function to rename sections in the config
35786 git-branch: rename config vars branch.<branch>.*, too
35787 Introduce GIT_TEMPLATE_DIR
35788 Use git-merge-file in git-merge-one-file, too
35789 git-tag: support -F <file> option
35790 git-reset --hard: tell the user what the HEAD was reset to
35791 move read_mmfile() into xdiff-interface
35792 Add a test for git-rerere
35793 Make git-rerere a builtin
35794 commit-tree: encourage UTF-8 commit messages.
35796 Josef Weidendorfer (2):
35797 Add branch.*.merge warning and documentation update
35798 Move "no merge candidate" warning into git-pull
35800 Junio C Hamano (115):
35801 upload-pack: stop the other side when they have more roots than we do.
35802 apply --numstat: mark binary diffstat with - -, not 0 0
35803 pack-objects: tweak "do not even attempt delta" heuristics
35804 Store peeled refs in packed-refs file.
35805 remove merge-recursive-old
35806 git-merge: make it usable as the first class UI
35807 merge: allow merging into a yet-to-be-born branch.
35808 Store peeled refs in packed-refs (take 2).
35809 git-fetch: reuse ls-remote result.
35810 git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
35811 git-fetch: allow glob pattern in refspec
35812 refs outside refs/{heads,tags} match less strongly.
35813 Typefix builtin-prune.c::prune_object()
35814 Allow git push to delete remote ref.
35815 gitweb: (style) use chomp without parentheses consistently.
35816 git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
35817 git-branch -D: make it work even when on a yet-to-be-born branch
35818 git-shortlog: fix common repository prefix abbreviation.
35819 git-shortlog: make common repository prefix configurable with .mailmap
35820 git-commit: show --summary after successful commit.
35821 git-fetch: exit with non-zero status when fast-forward check fails
35822 git-fetch: allow forcing glob pattern in refspec
35823 fetch-pack: do not barf when duplicate re patterns are given
35824 grep: do not skip unmerged entries when grepping in the working tree.
35825 git-merge: tighten error checking.
35826 git-merge: do not leak rev-parse output used for checking internally.
35827 cvsimport: style fixup.
35828 git-merge: fix confusion between tag and branch
35829 xmerge: make return value from xdl_merge() more usable.
35830 merge-recursive: use xdl_merge().
35831 read-tree: further loosen "working file will be lost" check.
35832 Loosen "working file will be lost" check in Porcelain-ish
35833 read-tree: document --exclude-per-directory
35834 git-merge: squelch needless error message.
35835 git-merge: fix "fix confusion between tag and branch" for real
35837 git-rerere: add 'gc' command.
35838 Documentation/git-commit: rewrite to make it more end-user friendly.
35839 git-commit: allow --only to lose what was staged earlier.
35840 shortlog: remove "[PATCH]" prefix from shortlog output
35841 shortlog: fix segfault on empty authorname
35842 diff --numstat: show binary with '-' to match "apply --numstat"
35843 add test case for recursive merge
35844 git-push: document removal of remote ref with :<dst> pathspec
35845 Revert "git-diff: Introduce --index and deprecate --cached."
35846 git merge: reword failure message.
35847 spurious .sp in manpages
35848 git-push: accept tag <tag> as advertised.
35849 send-pack: tighten checks for remote names
35850 branch --color: change default color selection.
35851 git-blame: show lines attributed to boundary commits differently.
35852 config documentation: group color items together.
35853 git-svn: allow both diff.color and color.diff
35854 Update git-diff documentation
35855 git-fetch: make it work from within a subdirectory.
35856 git-reset: make it work from within a subdirectory.
35857 git-reset [--mixed] <tree> [--] <paths>...
35858 merge: give a bit prettier merge message to "merge branch~$n"
35859 git-clone: use wildcard specification for tracking branches
35860 git-pull: refuse default merge without branch.*.merge
35861 git-clone: lose the artificial "first" fetch refspec
35862 git-clone: lose the traditional 'no-separate-remote' layout
35863 update-index: make D/F conflict error a bit more verbose.
35864 git-add: remove conflicting entry when adding.
35865 Fix check_file_directory_conflict().
35866 Fix mis-mark-up in git-merge-file.txt documentation
35867 markup fix in svnimport documentation.
35868 rev-list --left-right
35869 Teach all of log family --left-right output.
35870 Make left-right automatic.
35871 Teach show-branch how to show ref-log data.
35872 git-fetch: Avoid reading packed refs over and over again
35873 avoid accessing _all_ loose refs in git-show-ref --verify
35874 show-ref: fix --quiet --verify
35875 show-ref: fix --verify --hash=length
35876 parse-remote::expand_refs_wildcard()
35877 show-ref: fix --exclude-existing
35878 racy-git: documentation updates.
35879 rerere: fix breakage of resolving.
35880 fix testsuite: make sure they use templates freshly built from the source
35881 Teach git-branch to delete tracking branches with -r -d
35882 blame: -b (blame.blankboundary) and --root (blame.showroot)
35883 git-add --interactive
35884 git-add --interactive: hunk splitting
35885 Revert "fix testsuite: make sure they use templates freshly built from the source"
35886 Do not create $GIT_DIR/remotes/ directory anymore.
35887 Use preprocessor constants for environment variable names.
35888 Revert "Make left-right automatic."
35889 fix populate-filespec
35890 config_rename_section: fix FILE* leak
35891 simplify inclusion of system header files.
35892 revision: --skip=<n>
35893 git-add: error out when given no arguments.
35894 compat/inet_ntop: do not use u_int
35895 diff documentation: mostly talk about <commit>
35896 Revert "git-pull: refuse default merge without branch.*.merge"
35897 parse-remote: mark all refs not for merge only when fetching more than one
35898 _XOPEN_SOURCE problem also exists on FreeBSD
35899 commit-tree: do not overflow MAXPARENT
35900 merge and reset: adjust for "reset --hard" messages
35901 default pull: forget about "newbie protection" for now.
35902 Do not support "partial URL shorthand" anymore.
35903 Really fix headers for __FreeBSD__
35904 git-tag: lose exit after die
35905 Allow branch.*.merge to talk about remote tracking branches.
35906 git-add --interactive: add documentation
35907 match_pathspec() -- return how well the spec matched
35908 git-rm: update to saner semantics
35909 t3600: update the test for updated git rm
35910 git-rm: Documentation
35911 read_directory: show_both option.
35912 git-add: add ignored files when asked explicitly.
35913 git-add: warn when adding an ignored file with an explicit request.
35914 git-add -f: allow adding otherwise ignored files.
35918 Add -v and --abbrev options to git-branch
35919 git-branch: add options and tests for branch renaming
35920 rename_ref: use lstat(2) when testing for symlink
35921 git-branch: let caller specify logmsg
35926 Michael Loeffler (1):
35927 git-fetch: ignore dereferenced tags in expand_refs_wildcard
35929 Nicolas Pitre (11):
35930 builtin git-shortlog is broken
35931 pack-objects: remove redundent status information
35932 make 'git add' a first class user friendly interface to the index
35933 change the unpack limit treshold to a saner value
35934 repacked packs should be read-only
35935 make commit message a little more consistent and conforting
35936 make patch_delta() error cases a bit more verbose
35937 make git a bit less cryptic on fetch errors
35938 index-pack usage of mmap() is unacceptably slower on many OSes other than Linux
35939 clarify some error messages wrt unknown object types
35940 checkout: make the message about the need for a new branch a bit clearer
35942 Paul Mackerras (1):
35943 gitk: Fix enabling/disabling of menu items on Mac OS X
35946 config option log.showroot to show the diff of root commits
35949 Make git-clone --use-separate-remote the default
35952 git-clone documentation
35953 Documentation: new option -P for git-svnimport
35954 git-branch -d: do not stop at the first failure.
35955 Documentation/git-branch: new -r to delete remote-tracking branches.
35958 shortlog: remove range check
35960 Robert Fitzsimons (17):
35961 gitweb: Show '...' links in "summary" view only if there are more items
35962 gitweb: Add missing show '...' links change.
35963 gitweb: optimize git_get_last_activity.
35964 gitweb: optimize git_shortlog_body.
35965 gitweb: optimize git_summary.
35966 gitweb: Use rev-list pattern search options.
35967 gitweb: Require a minimum of two character for the search text.
35968 gitweb: Allow search to be disabled from the config file.
35969 gitweb: Paginate commit/author/committer search output
35970 gitweb: Add parse_commits, used to bulk load commit objects.
35971 gitweb: We do longer need the --parents flag in rev-list.
35972 gitweb: Change summary, shortlog actions to use parse_commits.
35973 gitweb: Change log action to use parse_commits.
35974 gitweb: Change header search action to use parse_commits.
35975 gitweb: Change atom, rss actions to use parse_commits.
35976 gitweb: Change history action to use parse_commits.
35977 gitweb: Use rev-list --skip option.
35979 Robin Rosenberg (1):
35980 Make cvsexportcommit work with filenames with spaces and non-ascii characters.
35982 Sean Estabrooks (1):
35983 Update documentation to remove incorrect GIT_DIFF_OPTS example.
35985 Shawn O. Pearce (30):
35986 Teach git-completion.bash how to complete git-merge.
35987 Hide plumbing/transport commands from bash completion.
35988 Teach bash how to complete options for git-name-rev.
35989 Add current branch in PS1 support to git-completion.bash.
35990 Teach bash how to complete git-format-patch.
35991 Teach bash how to complete git-cherry-pick.
35992 Teach bash how to complete git-rebase.
35993 Teach bash about git log/show/whatchanged options.
35994 Support bash completion of refs/remote.
35995 Teach bash about git-repo-config.
35996 Support --strategy=x completion in addition to --strategy x.
35997 Cache the list of merge strategies and available commands during load.
35998 Teach bash about git-am/git-apply and their whitespace options.
35999 Teach bash how to complete long options for git-commit.
36000 Fix broken bash completion of local refs.
36001 Remove uncontested renamed files during merge.
36002 Avoid accessing a slow working copy during diffcore operations.
36003 Provide more meaningful output from 'git init-db'.
36004 Enable reflogs by default in any repository with a working directory.
36005 Teach bash the new features of 'git show'.
36006 Suggest use of "git add file1 file2" when there is nothing to commit.
36007 Align section headers of 'git status' to new 'git add'.
36008 Default GIT_COMMITTER_NAME to login name in recieve-pack.
36009 Suggest 'add' in am/revert/cherry-pick.
36010 Rename imap-send's internal info/warn functions.
36011 Introduce a global level warn() function.
36012 Use extended SHA1 syntax in merge-recursive conflicts.
36013 Display 'theirs' branch name when possible in merge.
36014 Rename gitfakemmap to git_mmap.
36015 Switch git_mmap to use pread.
36017 Terje Sten Bjerkseth (1):
36018 Fix system header problems on Mac OS X
36020 Uwe Kleine-König (1):
36021 Fix documentation copy&paste typo
36024 Version v1.4.4.5; changes since v1.4.4.4:
36025 -----------------------------------------
36028 clean up pack index handling a bit
36029 clean up and optimize nth_packed_object_sha1() usage
36030 get rid of num_packed_objects()
36031 pack-objects: learn about pack index version 2
36032 sha1_file.c: learn about index version 2
36035 Version v1.4.4.4; changes since v1.4.4.3:
36036 -----------------------------------------
36038 Johannes Schindelin (1):
36039 diff --check: fix off by one error
36041 Junio C Hamano (3):
36042 spurious .sp in manpages
36043 Fix infinite loop when deleting multiple packed refs.
36044 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
36047 Version v1.4.4.3; changes since v1.4.4.2:
36048 -----------------------------------------
36051 Clarify fetch error for missing objects.
36053 Brian Gernhardt (1):
36054 Move Fink and Ports check to after config file
36057 no need to install manpages as executable
36060 git-svn: exit with status 1 for test failures
36061 git-svn: correctly display fatal() error messages
36064 Don't use memcpy when source and dest. buffers may overlap
36066 Junio C Hamano (1):
36069 Martin Langhoff (1):
36070 cvsserver: Avoid miscounting bytes in Perl v5.8.x
36072 Shawn O. Pearce (2):
36073 Make sure the empty tree exists when needed in merge-recursive.
36074 Bypass expensive content comparsion during rename detection.
36077 Version v1.4.4.2; changes since v1.4.4.1:
36078 -----------------------------------------
36081 git-blame: fix rev parameter handling.
36084 Increase length of function name buffer
36085 Document git-repo-config --bool/--int options.
36088 git-svn: error out from dcommit on a parent-less commit
36089 git-svn: correctly handle revision 0 in SVN repositories
36090 git-svn: preserve uncommitted changes after dcommit
36091 git-svn: avoid fetching files twice in the same revision
36093 Johannes Schindelin (1):
36094 git-mv: search more precisely for source directory in index
36096 Junio C Hamano (5):
36097 git blame -C: fix output format tweaks when crossing file boundary.
36098 tutorial: talk about user.name early and don't start with commit -a
36099 receive-pack: do not insist on fast-forward outside refs/heads/
36100 unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
36101 git-reset to remove "$GIT_DIR/MERGE_MSG"
36104 archive-zip: don't use sizeof(struct ...)
36107 Version v1.4.4.1; changes since v1.4.4:
36108 ---------------------------------------
36110 Alexandre Julliard (1):
36111 gitweb: Put back shortlog instead of graphiclog in the project list.
36114 Move --pretty options into Documentation/pretty-formats.txt
36117 Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed data.
36119 Johannes Schindelin (1):
36120 Seek back to current filepos when mmap()ing with NO_MMAP
36122 Junio C Hamano (7):
36123 git-checkout: do not allow -f and -m at the same time.
36124 git-checkout: allow pathspec to recover lost working tree directory
36125 convert-objects: set _XOPEN_SOURCE to 600
36126 git-fetch: follow lightweit tags as well.
36127 do_for_each_ref: perform the same sanity check for leftovers.
36128 trust-executable-bit: fix breakage for symlinks
36131 Linus Torvalds (2):
36132 git-pull: allow pulling into an empty repository
36133 "git fmt-merge-msg" SIGSEGV
36136 archive: use setvbuf() instead of setlinebuf()
36138 Paolo Ciarrocchi (2):
36139 Teach SubmittingPatches about git-commit -s
36140 Doc: Make comment about merging in tutorial.txt more clear
36143 Fix git-for-each-refs broken for tags
36144 git-apply: Documentation typo fix
36145 Documentation: Define symref and update HEAD description
36146 Documentation: Correct alternates documentation, document http-alternates
36149 sparse fix: non-ANSI function declaration
36150 sparse fix: Using plain integer as NULL pointer
36151 git-apply: slightly clean up bitfield usage
36152 Document git-runstatus
36155 Version v1.4.4; changes since v1.4.4-rc2:
36156 -----------------------------------------
36159 test-lib.sh: A command dying due to a signal is an unexpected failure.
36160 Catch errors when writing an index that contains invalid objects.
36163 git-update-index(1): fix use of quoting in section title
36165 Junio C Hamano (1):
36168 Robin Rosenberg (1):
36169 Rework cvsexportcommit to handle binary files for all cases.
36172 Version v1.4.4-rc2; changes since v1.4.4-rc1:
36173 ---------------------------------------------
36176 git-svn: avoid printing filenames of files we're not tracking
36177 git-svn: don't die on rebuild when --upgrade is specified
36178 git-svn: fix dcommit losing changes when out-of-date from svn
36180 Jakub Narębski (3):
36181 gitweb: Better git-unquoting and gitweb-quoting of pathnames
36182 gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
36183 gitweb: New improved patchset view
36185 Junio C Hamano (14):
36186 gitweb: fix disabling of "forks"
36187 gitweb: minimally fix "fork" support.
36188 gitweb: do not give blame link unconditionally in diff-tree view
36189 git-status: quote LF in its output
36190 git-pickaxe: retire pickaxe
36191 gitweb: protect blob and diff output lines from controls.
36192 gitweb: protect commit messages from controls.
36193 gitweb: fix unmatched div in commitdiff
36194 Documentation: move blame examples
36195 git-annotate: no need to exec blame; it is built-in now.
36196 git-annotate: fix -S on graft file with comments.
36197 path-list: fix path-list-insert return value
36198 git-cvsserver: read from git with -z to get non-ASCII pathnames.
36201 OGAWA Hirofumi (1):
36202 gitk: Fix nextfile() and add prevfile()
36205 Nicer error messages in case saving an object to db goes wrong
36207 Robert Shearman (1):
36208 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
36211 Version v1.4.4-rc1; changes since v1.4.3.5:
36212 -------------------------------------------
36215 Gitweb - provide site headers and footers
36217 Alexandre Julliard (5):
36218 pack-refs: Store the full name of the ref even when packing only tags.
36219 git.el: Added functions for moving to the next/prev unmerged file.
36220 git.el: Added a function to open the current file in another window.
36221 git.el: Move point after the log message header when entering log-edit mode.
36222 git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
36225 Make filenames line up in git-status output
36226 Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
36228 Andy Whitcroft (2):
36229 cvsimport: move over to using git-for-each-ref to read refs.
36230 git-for-each-ref: improve the documentation on scripting modes
36232 Aneesh Kumar K.V (1):
36233 gitweb: Remove extra "/" in path names for git_get_project_list
36235 Christian Couder (12):
36236 Add [-s|--hash] option to Linus' show-ref.
36237 Use Linus' show ref in "git-branch.sh".
36238 Document git-show-ref [-s|--hash] option.
36239 Fix show-ref usage for --dereference.
36240 Add pack-refs and show-ref test cases.
36241 When creating branch c/d check that branch c does not already exists.
36242 Uncomment test case: git branch c/d should barf if branch c exists.
36243 Fix a remove_empty_dir_recursive problem.
36244 Clean up "git-branch.sh" and add remove recursive dir test cases.
36245 Use git-update-ref to delete a tag instead of rm()ing the ref file.
36246 Check that a tag exists using show-ref instead of looking for the ref file.
36247 Do not create tag leading directories since git update-ref does it.
36249 Dennis Stosberg (3):
36250 lock_ref_sha1_basic does not remove empty directories on BSD
36251 Remove bashism from t3210-pack-refs.sh
36252 Bash completion support for aliases
36254 Dmitry V. Levin (1):
36255 git-clone: define die() and use it.
36258 Use memmove instead of memcpy for overlapping areas
36261 git-send-email: do not pass custom Date: header
36262 git-svn: avoid printing filenames of files we're not tracking
36263 git-svn: don't die on rebuild when --upgrade is specified
36265 Jakub Narębski (14):
36266 gitweb: Improve git_print_page_path
36267 gitweb: Add '..' (up directory) to tree view if applicable
36268 gitweb: Get rid of git_print_simplified_log
36269 gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiff
36270 gitweb: Print commit message without title in commitdiff only if there is any
36271 gitweb: Use --no-commit-id in git_commit and git_commitdiff
36272 Documentation: Update information about <format> in git-for-each-ref
36273 gitweb: Move git_get_last_activity subroutine earlier
36274 gitweb: Add "next" link to commitdiff view
36275 gitweb: Secure against commit-ish/tree-ish with the same name as path
36276 gitweb: Use 's' regexp modifier to secure against filenames with LF
36277 gitweb: Use git-for-each-ref to generate list of heads and/or tags
36278 gitweb: Output also empty patches in "commitdiff" view
36279 gitweb: Better support for non-CSS aware web browsers
36282 wt-status: use simplified resolve_ref to find current branch
36283 gitignore: git-pack-refs is a generated file.
36284 gitignore: git-show-ref is a generated file.
36285 git-pickaxe: work properly in a subdirectory.
36288 Don't use $author_name undefined when $from contains no /\s</.
36290 Johannes Schindelin (3):
36291 Fix git-update-index --again
36292 show-branch: mark active branch with a '*' again
36293 Turn on recursive with --summary
36296 Add man page for git-show-ref
36298 Junio C Hamano (96):
36299 Add git-for-each-ref: helper for language bindings
36300 Fix t1400-update-ref test minimally
36301 fsck-objects: adjust to resolve_ref() clean-up.
36302 symbolit-ref: fix resolve_ref conversion.
36303 Add callback data to for_each_ref() family.
36304 Tell between packed, unpacked and symbolic refs.
36305 pack-refs: do not pack symbolic refs.
36306 git-pack-refs --prune
36307 pack-refs: fix git_path() usage.
36308 lock_ref_sha1_basic: remove unused parameter "plen".
36309 Clean-up lock-ref implementation
36310 update-ref: -d flag and ref creation safety.
36311 update a few Porcelain-ish for ref lock safety.
36312 Teach receive-pack about ref-log
36313 receive-pack: call setup_ident before git_config
36315 teach revision walker about --all-match.
36316 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)
36317 ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore.
36318 refs: minor restructuring of cached refs data.
36319 lock_ref_sha1(): do not sometimes error() and sometimes die().
36320 lock_ref_sha1(): check D/F conflict with packed ref when creating.
36321 delete_ref(): delete packed ref
36322 git-branch: remove D/F check done by hand.
36323 show-ref --hash=len, --abbrev=len, and --abbrev
36324 git-fetch: adjust to packed-refs.
36325 Fix refs.c;:repack_without_ref() clean-up path
36326 gitweb: make leftmost column of blame less cluttered.
36327 git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.
36328 pack-refs: use lockfile as everybody else does.
36329 gitweb: prepare for repositories with packed refs.
36330 Revert 954a6183756a073723a7c9fd8d2feb13132876b0
36331 pack-refs: call fflush before fsync.
36332 blame.c: whitespace and formatting clean-up.
36333 git-blame: --show-name (and -f)
36334 git-blame: --show-number (and -n)
36335 blame.c: move code to output metainfo into a separate function.
36336 git-send-email: do not drop custom headers the user prepared
36337 ref-log: allow ref@{count} syntax.
36338 git-send-email: real name with period need to be dq-quoted on From: line
36339 git-blame --porcelain
36340 gitweb: use blame --porcelain
36341 Make git-send-email detect mbox-style patches more readily
36342 core.logallrefupdates create new log file only for branch heads.
36343 git-pack-refs --all
36344 core.logallrefupdates thinko-fix
36345 pack-objects: document --delta-base-offset option
36346 blame: Document and add help text for -f, -n, and -p
36347 gitweb: spell "blame --porcelain" with -p
36348 git-repack: repo.usedeltabaseoffset
36350 gitweb: use for-each-ref to show the latest activity across branches
36351 ref-log: fix D/F conflict coming from deleted refs.
36352 git-pickaxe: blame rewritten.
36353 git-pickaxe -M: blame line movements within a file.
36354 git-pickaxe -C: blame cut-and-pasted lines.
36355 git-pickaxe: pagenate output by default.
36356 git-pickaxe: fix nth_line()
36357 git-pickaxe: improve "best match" heuristics
36358 git-pickaxe: introduce heuristics to avoid "trivial" chunks
36359 git-pickaxe: do not keep commit buffer.
36360 git-pickaxe: do not confuse two origins that are the same.
36361 git-pickaxe: get rid of wasteful find_origin().
36362 git-pickaxe: swap comparison loop used for -C
36363 sha1_name.c: avoid compilation warnings.
36364 t3200: git-branch testsuite update
36365 tests: merge-recursive is usable without Python
36366 merge: loosen overcautious "working file will be lost" check.
36367 merge-recursive: use abbreviated commit object name.
36368 merge-recursive: make a few functions static.
36369 merge-recursive: adjust to loosened "working file clobbered" check
36370 t6022: ignoring untracked files by merge-recursive when they do not matter
36371 Documentation: fix git-format-patch mark-up and link it from git.txt
36372 send-pack --keep: do not explode into loose objects on the receiving end.
36373 git-pickaxe: WIP to refcount origin structure.
36374 git-pickaxe: allow -Ln,m as well as -L n,m
36375 git-pickaxe: refcount origin correctly in find_copy_in_parent()
36376 git-pickaxe: tighten sanity checks.
36377 Revert "send-pack --keep: do not explode into loose objects on the receiving end."
36378 git-pickaxe: split find_origin() into find_rename() and find_origin().
36379 git-pickaxe: cache one already found path per commit.
36380 Introduce a new revision set operator <rev>^!
36381 branch: work in subdirectories.
36382 for-each-ref: "creator" and "creatordate" fields
36383 git-pickaxe: rename detection optimization
36384 git-pickaxe: simplify Octopus merges further
36385 git-pickaxe: re-scan the blob after making progress with -M
36386 git-pickaxe: re-scan the blob after making progress with -C
36387 git-pickaxe: fix origin refcounting
36388 cherry is built-in, do not ship git-cherry.sh
36389 git-blame: add internal statistics to count read blobs.
36390 git-pickaxe: optimize by avoiding repeated read_sha1_file().
36391 Document git-pack-refs and link it to git(7).
36392 git-pickaxe: -L /regexp/,/regexp/
36393 git-pickaxe: allow "-L <something>,+N"
36397 ignore-errors requires cl
36400 Make git-branch a builtin
36401 Fix show-ref usagestring
36403 Linus Torvalds (8):
36404 Add "git show-ref" builtin command
36405 Teach "git checkout" to use git-show-ref
36406 Start handling references internally as a sorted in-memory list
36407 Add support for negative refs
36408 Make ref resolution saner
36409 Enable the packed refs file format
36410 Allow '-' in config variable names
36411 git push: add verbose flag and allow overriding of default target repository
36414 gitweb: blame: print commit-8 on the leading row of a commit-block
36415 gitweb: blame: Mouse-over commit-8 shows author and date
36416 gitweb: blame porcelain: lineno and orig lineno swapped
36417 git-revert with conflicts to behave as git-merge with conflicts
36418 gitweb: esc_html() author in blame
36421 gitweb: start to generate PATH_INFO URLs.
36422 gitweb: warn if feature cannot be overridden.
36424 Matthew Wilcox (1):
36425 Add --dry-run option to git-send-email
36427 Nicolas Pitre (24):
36428 introduce delta objects with offset to base
36429 teach git-unpack-objects about deltas with offset to base
36430 teach git-index-pack about deltas with offset to base
36431 make git-pack-objects able to create deltas with offset to base
36432 make pack data reuse compatible with both delta types
36433 let the GIT native protocol use offsets to delta base when possible
36434 zap a debug remnant
36435 allow delta data reuse even if base object is a preferred base
36436 index-pack: compare only the first 20-bytes of the key.
36437 add the capability for index-pack to read from a stream
36438 enable index-pack streaming capability
36439 make index-pack able to complete thin packs.
36440 add progress status to index-pack
36441 mimic unpack-objects when --stdin is used with index-pack
36442 enhance clone and fetch -k experience
36443 index-pack: minor fixes to comment and function name
36444 missing small substitution
36445 make git-push a bit more verbose
36446 Allow pack header preprocessing before unpack-objects/index-pack.
36447 git-fetch can use both --thin and --keep with fetch-pack now
36448 improve fetch-pack's handling of kept packs
36449 have index-pack create .keep file more carefully
36450 remove .keep pack lock files when done with refs update
36451 git-pack-objects progress flag documentation and cleanup
36454 Fix broken sha1 locking
36455 Fix buggy ref recording
36456 gitweb: Document features better
36457 gitweb: Fix search form when PATH_INFO is enabled
36458 bisect reset: Leave the tree in usable state if git-checkout failed
36459 gitweb: Restore object-named links in item lists
36460 gitweb: Make search type a popup menu
36461 gitweb: Do not automatically append " git" to custom site name
36462 gitweb: Show project's README.html if available
36463 gitweb: Support for 'forks'
36464 gitweb: Fix up bogus $stylesheet declarations
36467 git-archive --format=zip: use default version ID
36468 git-archive --format=zip: add symlink support
36470 Make git-cherry handle root trees
36472 Robert Shearman (2):
36473 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
36474 git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
36476 Robin Rosenberg (2):
36477 Mention that pull can work locally in the synopsis
36478 Swap the porcelain and plumbing commands in the git man page
36481 Remove git-annotate.perl and create a builtin-alias for git-blame
36484 fetch: Misc output cleanup
36485 merge and resolve: Output short hashes and .. in "Updating ..."
36487 Sasha Khapyorsky (2):
36488 git-svnimport.perl: copying directory from original SVN place
36489 git-svnimport: support for partial imports
36491 Sean Estabrooks (1):
36492 Add --global option to git-repo-config.
36495 git-send-email: Document support for local sendmail instead of SMTP server
36496 git-send-email: Read the default SMTP server from the GIT config file
36498 Shawn O. Pearce (15):
36499 Use column indexes in git-cvsserver where necessary.
36500 Allow short pack names to git-pack-objects --unpacked=.
36501 Only repack active packs by skipping over kept packs.
36502 Teach git-index-pack how to keep a pack file.
36503 Remove unused variable in receive-pack.
36504 Move deny_non_fast_forwards handling completely into receive-pack.
36505 Teach receive-pack how to keep pack files based on object count.
36506 Added completion support for git-branch.exe.
36507 Added bash completion support for git-reset.
36508 Added missing completions for show-branch and merge-base.
36509 Only load .exe suffix'd completions on Cygwin.
36510 Bash completion support for remotes in .git/config.
36511 Take --git-dir into consideration during bash completion.
36512 Support bash completion on symmetric difference operator.
36513 Remove more sed invocations from within bash completion.
36516 Version v1.4.3.5; changes since v1.4.3.4:
36517 -----------------------------------------
36520 merge-recursive implicitely depends on trust_executable_bit
36523 git-svn: avoid printing filenames of files we're not tracking
36524 git-svn: don't die on rebuild when --upgrade is specified
36525 git-svn: fix dcommit losing changes when out-of-date from svn
36527 Jakub Narębski (1):
36528 Documentation: Transplanting branch with git-rebase --onto
36531 Fix git-runstatus for repositories containing a file named HEAD
36533 Junio C Hamano (3):
36534 adjust_shared_perm: chmod() only when needed.
36535 path-list: fix path-list-insert return value
36536 git-cvsserver: read from git with -z to get non-ASCII pathnames.
36539 Nicer error messages in case saving an object to db goes wrong
36541 Robert Shearman (1):
36542 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
36545 remove an unneeded test
36548 Version v1.4.3.4; changes since v1.4.3.3:
36549 -----------------------------------------
36552 Minor grammar fixes for git-diff-index.txt
36553 git-clone documentation didn't mention --origin as equivalent of -o
36555 Christian Couder (3):
36556 Remove --syslog in git-daemon inetd documentation examples.
36557 Documentation: add upload-archive service to git-daemon.
36558 Documentation: add git in /etc/services.
36561 Use memmove instead of memcpy for overlapping areas
36563 J. Bruce Fields (1):
36564 Documentation: updates to "Everyday GIT"
36566 Jakub Narębski (3):
36567 diff-format.txt: Combined diff format documentation supplement
36568 diff-format.txt: Correct information about pathnames quoting in patch format
36569 gitweb: Check git base URLs before generating URL from it
36572 Continue traversal when rev-list --unpacked finds a packed commit.
36574 Johannes Schindelin (1):
36575 link_temp_to_file: call adjust_shared_perm() only when we created the directory
36577 Junio C Hamano (9):
36578 Documentation: clarify refname disambiguation rules.
36579 combine-diff: a few more finishing touches.
36580 combine-diff: fix hunk_comment_line logic.
36581 combine-diff: honour --no-commit-id
36582 Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
36583 quote.c: ensure the same quoting across platforms.
36584 revision traversal: --unpacked does not limit commit list anymore.
36585 link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
36586 apply: handle "traditional" creation/deletion diff correctly.
36589 pack-objects doesn't create random pack names
36592 git-cherry: document limit and add diagram
36594 Shawn O. Pearce (3):
36595 Use ULONG_MAX rather than implicit cast of -1.
36596 Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
36597 Remove unsupported C99 style struct initializers in git-archive.
36600 Version v1.4.3.3; changes since v1.4.3.2:
36601 -----------------------------------------
36604 git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
36607 Set $HOME for selftests
36609 Junio C Hamano (5):
36610 Documentation: note about contrib/.
36611 RPM package re-classification.
36612 Refer to git-rev-parse:Specifying Revisions from git.txt
36613 Update cherry documentation.
36614 Documentation/SubmittingPatches: 3+1 != 6
36617 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
36620 git-fetch.sh printed protocol fix
36623 Version v1.4.3.2; changes since v1.4.3.1:
36624 -----------------------------------------
36626 Alexandre Julliard (1):
36627 prune-packed: Fix uninitialized variable.
36629 J. Bruce Fields (1):
36630 Make prune also run prune-packed
36632 Jakub Narębski (2):
36633 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
36634 gitweb: Do not esc_html $basedir argument to git_print_tree_entry
36637 git-clone: honor --quiet
36638 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
36640 Junio C Hamano (2):
36641 pager: default to LESS=FRSX not LESS=FRS
36642 daemon: do not die on older clients.
36645 git-vc: better installation instructions
36648 Fix usagestring for git-branch
36651 gitweb: Fix setting $/ in parse_commit()
36654 git-merge: show usage if run without arguments
36657 Documentation for the [remote] config
36660 Version v1.4.3.1; changes since v1.4.3:
36661 ---------------------------------------
36663 Junio C Hamano (1):
36664 pager: default to LESS=FRS
36667 Fix typo in show-index.c
36669 Linus Torvalds (1):
36670 git-apply: prepare for upcoming GNU diff -u format change.
36672 Nguyễn Thái Ngọc Duy (2):
36673 Reject hexstring longer than 40-bytes in get_short_sha1()
36674 Add revspec documentation for ':path', ':[0-3]:path' and git-describe
36677 reduce delta head inflated size
36680 Version v1.4.3; changes since v1.4.3-rc3:
36681 -----------------------------------------
36683 Andy Whitcroft (1):
36684 add proper dependancies on the xdiff source
36686 Junio C Hamano (1):
36687 Revert "move pack creation to version 3"
36689 Linus Torvalds (1):
36690 Fix hash function in xdiff library
36693 git-imap-send: Strip smtp From_ header from imap message.
36696 svnimport: Fix broken tags being generated
36699 Make write_sha1_file_prepare() void
36700 Replace open-coded version of hash_sha1_file()
36703 Version v1.4.3-rc3; changes since v1.4.3-rc2:
36704 ---------------------------------------------
36706 Christian Couder (1):
36707 Fix tracing when GIT_TRACE is set to an empty string.
36710 git-svn: multi-init saves and reuses --tags and --branches arguments
36711 git-svn: log command fixes
36712 Documentation/git-svn: document some of the newer features
36713 git-svn: -h(elp) message formatting fixes
36714 commit: fix a segfault when displaying a commit with unreachable parents
36715 git-svn: add a message encouraging use of SVN::* libraries
36716 git-svn: fix commits over svn+ssh://
36717 git-svn: reduce memory usage for large commits
36719 Johannes Schindelin (3):
36720 diff: fix 2 whitespace issues
36721 cvsserver: Show correct letters for modified, removed and added files
36722 cvsserver: fix "cvs diff" in a subdirectory
36724 Junio C Hamano (6):
36725 Add WEBDAV timeout to http-fetch.
36726 git-fetch --update-head-ok typofix
36727 git-pull: we say commit X, not X commit.
36728 git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
36729 apply --numstat -z: line termination fix.
36730 t4015: work-around here document problem on Cygwin.
36733 paginate git-diff by default
36736 atomic write for sideband remote messages
36739 Documentation: add missing second colons and remove a typo
36740 Add hash_sha1_file()
36741 Make write_sha1_file_prepare() static
36744 clone: the given repository dir should be relative to $PWD
36747 Version v1.4.3-rc2; changes since v1.4.3-rc1:
36748 ---------------------------------------------
36751 Update the gitweb/README file to include setting the GITWEB_CONFIG environment
36752 Fix usage string to match that given in the man page
36754 Alexandre Julliard (2):
36755 git.el: Fixed inverted "renamed from/to" message.
36756 vc-git.el: Switch to using git-blame instead of git-annotate.
36758 Dennis Stosberg (2):
36759 lock_ref_sha1_basic does not remove empty directories on BSD
36760 Add default values for --window and --depth to the docs
36762 Franck Bui-Huu (1):
36763 Add git-upload-archive to the main git man page
36765 Jakub Narębski (1):
36766 gitweb: Cleanup Git logo and Git logo target generation
36768 Junio C Hamano (9):
36769 Makefile: install and clean merge-recur, still.
36770 git-mv: invalidate the removed path properly in cache-tree
36771 git-push: .git/remotes/ file does not require SP after colon
36772 escape tilde in Documentation/git-rev-parse.txt
36773 tar-tree deprecation: we eat our own dog food.
36774 gitweb: Make the Git logo link target to point to the homepage
36775 git-send-email: avoid uninitialized variable warning.
36776 cherry-pick: make -r the default
36780 gitweb: Escape ESCAPE (\e) character
36781 gitweb: Do not print "log" and "shortlog" redundantly in commit view
36782 gitweb: blame: Minimize vertical table row padding
36785 gitweb: document webserver configuration for common gitweb/repo URLs.
36786 git-commit: cleanup unused function.
36787 git-commit: fix coding style.
36788 test-lib: separate individual test better in verbose mode.
36791 add commit count options to git-shortlog
36794 Show snapshot link in shortlog only if have_snapsho
36795 gitweb: Separate (new) and (deleted) in commitdiff by a space
36796 gitweb: Handle commits with empty commit messages more reasonably
36797 gitweb: [commit view] Do not suppress commitdiff link in root commit
36800 git-tar-tree: don't RUN_SETUP
36802 Robin Rosenberg (1):
36803 Error in test description of t1200-tutorial
36806 gitweb: refactor decode() for utf8 conversion
36809 Version v1.4.3-rc1; changes since v1.4.2.4:
36810 -------------------------------------------
36813 Use const for interpolate arguments
36814 fix daemon.c compilation for NO_IPV6=1
36815 do not discard constness in interp_set_entry value argument
36817 Andy Whitcroft (3):
36818 send-pack: remove remote reference limit
36819 send-pack: switch to using git-rev-list --stdin
36820 svnimport: add support for parsing From: lines for author
36822 Aneesh Kumar K.V (4):
36823 gitweb: Support for snapshot
36824 gitweb: fix snapshot support
36825 gitweb: Make blame and snapshot a feature.
36826 gitweb: Fix git_blame
36829 Patch for http-fetch.c and older curl releases
36831 Christian Couder (8):
36832 Trace into open fd and refactor tracing code.
36833 Trace into a file or an open fd and refactor tracing code.
36834 Update GIT_TRACE documentation.
36835 Fix memory leak in prepend_to_path (git.c).
36836 Move add_to_string to "quote.c" and make it extern.
36837 Fix a memory leak in "connect.c" and die if command too long.
36838 Fix space in string " false" problem in "trace.c".
36839 Remove empty ref directories that prevent creating a ref.
36841 David Rientjes (18):
36842 blame.c return cleanup
36843 builtin-grep.c cleanup
36844 builtin-push.c cleanup
36846 http-push.c cleanup
36847 read-cache.c cleanup
36848 Make pprint_tag void and cleans up call in cmd_cat_file.
36849 Make show_entry void
36850 Make checkout_all void.
36851 Make fsck_dir void.
36852 Make pack_objects void.
36853 Make track_tree_refs void.
36854 Make upload_pack void and remove conditional return.
36855 Make sha1flush void and remove conditional return.
36856 make inline is_null_sha1 global
36857 use appropriate typedefs
36858 remove unnecessary initializations
36859 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
36861 Dennis Stosberg (10):
36862 "test" in Solaris' /bin/sh does not support -e
36863 Makefile fix for Solaris
36864 Add possibility to pass CFLAGS and LDFLAGS specific to the perl subdir
36865 Solaris has strlcpy() at least since version 8
36866 Look for sockaddr_storage in sys/socket.h
36867 Fix detection of ipv6 on Solaris
36868 Fix compilation with Sun CC
36869 gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
36870 gitweb: Remove forgotten call to git_to_hash
36871 use do() instead of require() to include configuration
36873 Dmitry V. Levin (3):
36874 Make count-objects, describe and merge-tree work in subdirectory
36875 Documentation: Fix broken links
36876 Handle invalid argc gently
36879 pass DESTDIR to the generated perl/Makefile
36880 git-svn: establish new connections on commit after fork
36881 git-svn: recommend rebase for syncing against an SVN repo
36882 git-svn: add the 'dcommit' command
36883 git-svn: stop repeatedly reusing the first commit message with dcommit
36885 Franck Bui-Huu (10):
36886 Add a newline before appending "Signed-off-by: " line
36887 log-tree.c: cleanup a bit append_signoff()
36889 git-archive: wire up TAR format.
36890 git-archive: wire up ZIP format.
36891 Add git-upload-archive
36892 connect.c: finish_connect(): allow null pid parameter
36893 Test return value of finish_connect()
36894 upload-archive: monitor child communication even more carefully.
36895 git-archive: update documentation
36897 Haavard Skinnemoen (1):
36898 git-send-email: Don't set author_not_sender from Cc: lines
36900 Jakub Narębski (138):
36901 gitweb: whitespace cleanup
36902 gitweb: Use list for of open for running git commands, thorougly.
36903 gitweb: simplify git_get_hash_by_path
36904 gitweb: More explicit error messages for open "-|"
36905 gitweb: Cleanup - chomp $line in consistent style
36906 gitweb: Cleanup - chomp @lines in consistent style
36907 gitweb: Add git_page_nav for later use
36908 gitweb: Navbar refactoring - use git_page_nav to generate navigation bar
36909 gitweb: Replace form-feed character by ^L
36910 gitweb: Show project descriptions with utf-8 characters in project list correctly
36911 gitweb: Add "\n" after <br/> in git_page_nav
36912 gitweb: Pager refactoring - use git_get_paging_nav for pagination
36913 gitweb: Remove $project from git_get_paging_nav arguments
36914 gitweb: Headers refactoring - use git_header_div for header divs
36915 gitweb: Remove characters entities entirely when shortening string
36916 gitweb: Ref refactoring - use git_get_referencing for marking tagged/head commits
36917 gitweb: Refactor generation of shortlog, tags and heads body
36918 gitweb: do not quote path for list version of open "-|"
36919 gitweb: Remove characters entities entirely when shortening string -- correction
36920 gitweb: Reordering code and dividing it into categories
36921 gitweb: Refactoring git_project_list
36922 autoconf: Add support for setting SHELL_PATH and PERL_PATH
36923 autoconf: Move site configuration section earlier in configure.ac
36924 autoconf: Add support for setting PYTHON_PATH or NO_PYTHON
36925 autoconf: Check for ll hh j z t size specifiers introduced by C99
36926 autoconf: Typo cleanup, reordering etc.
36927 Copy description of new build configuration variables to configure.ac
36928 autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
36929 gitweb: Separate input validation and dispatch, add comment about opml action
36930 gitweb: die_error first (optional) parameter is HTTP status
36931 gitweb: Use undef for die_error to use default first (status) parameter value
36932 gitweb: Don't undefine query parameter related variables before die_error
36933 gitweb: Cleanup and uniquify error messages
36934 gitweb: No periods for error messages
36935 gitweb: No error messages with unescaped/unprotected user input
36936 gitweb: PATH_INFO=/ means no project
36937 gitweb: Inline $rss_link
36938 gitweb: Refactor untabifying - converting tabs to spaces
36939 gitweb: fix commitdiff for root commits
36940 gitweb: Skip nonmatching lines in difftree output, consistently
36941 autoconf: Unset NO_STH and NEED_STH when it is detected not needed
36942 gitweb: Remove unused variables in git_shortlog_body and git_heads
36943 autoconf: Add configure target to main Makefile
36944 autoconf: Error out on --without-shell and --without-perl
36945 autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling
36946 autoconf: Move variables which we always set to config.mak.in
36947 autoconf: It is --without-python, not --no-python
36948 autoconf: Add support for setting CURLDIR, OPENSSLDIR, EXPATDIR
36949 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align
36950 gitweb: Great subroutines renaming
36951 gitweb: Separate ref parsing in git_get_refs_list into parse_ref
36952 gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
36953 gitweb: Separate main part of git_history into git_history_body
36954 gitweb: Separate finding project owner into git_get_project_owner
36955 gitweb: Change appereance of marker of refs pointing to given object
36956 gitweb: Skip comments in mime.types like file
36957 gitweb: True fix: Support for the standard mime.types map in gitweb
36958 gitweb: Separate printing difftree in git_commit into git_difftree_body
36959 gitweb: Show project's git URL on summary page
36960 gitweb: Add support for per project git URLs
36961 gitweb: Uniquify version info output, add meta generator in page header
36962 gitweb: Refactor printing commit message
36963 gitweb: Added parse_difftree_raw_line function for later use
36964 gitweb: Use parse_difftree_raw_line in git_difftree_body
36965 gitweb: bugfix: a.list formatting regression
36966 gitweb: Replace some presentational HTML by CSS
36967 gitweb: Whitespace cleanup: realign, reindent
36968 gitweb: Use underscore instead of hyphen to separate words in HTTP headers names
36969 gitweb: Route rest of action subroutines through %actions
36970 gitweb: Use here-doc
36971 gitweb: Drop the href() params which keys are not in %mapping
36972 gitweb: Sort CGI parameters returned by href()
36973 gitweb: Use git-diff-tree patch output for commitdiff
36974 gitweb: Show information about incomplete lines in commitdiff
36975 gitweb: Remove invalid comment in format_diff_line
36976 gitweb: Streamify patch output in git_commitdiff
36977 gitweb: Add git_get_{following,preceding}_references functions
36978 gitweb: Faster return from git_get_preceding_references if possible
36979 gitweb: Add git_get_rev_name_tags function
36980 gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
36981 gitweb: Add support for hash_parent_base parameter for blobdiffs
36982 gitweb: Allow for pre-parsed difftree info in git_patchset_body
36983 gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
36984 gitweb: Add invisible hyperlink to from-file/to-file diff header
36985 gitweb: Always display link to blobdiff_plain in git_blobdiff
36986 gitweb: Change here-doc back for style consistency in git_blobdiff
36987 gitweb: Use git-diff-tree or git-diff patch output for blobdiff
36988 gitweb: git_blobdiff_plain is git_blobdiff('plain')
36989 gitweb: Remove git_diff_print subroutine
36990 gitweb: Remove creating directory for temporary files
36991 gitweb: git_annotate didn't expect negative numeric timezone
36992 gitweb: Remove workaround for git-diff bug fixed in f82cd3c
36993 gitweb: Improve comments about gitweb features configuration
36994 gitweb: blobs defined by non-textual hash ids can be cached
36995 gitweb: Fix typo in git_difftree_body
36996 gitweb: Fix typo in git_patchset_body
36997 gitweb: Remove unused git_get_{preceding,following}_references
36998 gitweb: Remove git_to_hash function
36999 gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
37000 gitweb: Make git_print_log generic; git_print_simplified_log uses it
37001 gitweb: Do not remove signoff lines in git_print_simplified_log
37002 gitweb: Add author information to commitdiff view
37003 gitweb: git_print_log: signoff line is non-empty line
37004 gitweb: Add diff tree, with links to patches, to commitdiff view
37005 gitweb: Add local time and timezone to git_print_authorship
37006 gitweb: Move git-ls-tree output parsing to parse_ls_tree_line
37007 gitweb: Separate printing of git_tree row into git_print_tree_entry
37008 gitweb: Extend parse_difftree_raw_line to save commit info
37009 gitweb: Change the name of diff to parent link in "commit" view to "diff
37010 gitweb: Add GIT favicon, assuming image/png type
37011 gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body
37012 gitweb: Divide page path into directories -- path's "breadcrumbs"
37013 autoconf: Add -liconv to LIBS when NEEDS_LIBICONV
37014 autoconf: Check for subprocess.py
37015 autoconf: Quote AC_CACHE_CHECK arguments
37016 autoconf: Fix copy'n'paste error
37017 autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
37018 autoconf: Add support for setting NO_ICONV and ICONVDIR
37019 autoconf: Add config.cache to .gitignore
37020 gitweb: Make pickaxe search a feature
37021 gitweb: Paginate history output
37022 gitweb: Use File::Find::find in git_get_projects_list
37023 gitweb: Do not parse refs by hand, use git-peek-remote instead
37024 gitweb: Add git_project_index for generating index.aux
37025 gitweb: Allow for href() to be used for links without project param
37026 gitweb: Add link to "project_index" view to "project_list" page
37027 gitweb: Fix mimetype_guess_file for files with multiple extensions
37028 gitweb: Even more support for PATH_INFO based URLs
37029 gitweb: Require project for almost all actions
37030 gitweb: Always use git-peek-remote in git_get_references
37031 gitweb: Make git_get_refs_list do work of git_get_references
37032 gitweb: Fix thinko in git_tags and git_heads
37033 gitweb: Make git_get_hash_by_path check type if provided
37034 gitweb: Strip trailing slashes from $path in git_get_hash_by_path
37035 gitweb: Use "return" instead of "return undef" for some subs
37036 gitweb: Split validate_input into validate_pathname and validate_refname
37037 gitweb: Add git_url subroutine, and use it to quote full URLs
37038 gitweb: Quote filename in HTTP Content-Disposition: header
37041 gitweb: optionally read config from GITWEB_CONFIG
37042 diff: support custom callbacks for output
37043 Move color option parsing out of diff.c and into color.[ch]
37044 git-commit.sh: convert run_status to a C builtin
37045 git-status: document colorization config options
37046 contrib/vim: add syntax highlighting file for commits
37047 wt-status: remove extraneous newline from 'deleted:' output
37048 rev-list: fix segfault with --{author,committer,grep}
37049 git-repack: allow git-repack to run in subdirectory
37051 Johannes Schindelin (35):
37052 Git.xs: older perl do not know const char *
37053 Status update on merge-recursive in C
37054 Cumulative update of merge-recursive in C
37055 merge-recur: Convert variable names to lower_case
37056 merge-recur: Get rid of debug code
37057 merge-recur: Remove dead code
37058 merge-recur: Fix compiler warning with -pedantic
37059 merge-recur: Cleanup last mixedCase variables...
37060 merge-recur: Explain why sha_eq() and struct stage_data cannot go
37061 merge-recur: fix thinko in unique_path()
37062 read-trees: refactor the unpack_trees() part
37063 read-tree: move merge functions to the library
37064 merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
37065 merge-recur: virtual commits shall never be parsed
37066 merge-recursive: fix rename handling
37067 http-push: avoid fork() by calling merge_bases() directly
37068 merge-recur: do not call git-write-tree
37069 merge-recur: do not setenv("GIT_INDEX_FILE")
37070 merge-recur: if there is no common ancestor, fake empty one
37071 merge-recur: try to merge older merge bases first
37072 merge-recur: do not die unnecessarily
37073 discard_cache(): discard index, even if no file was mmap()ed
37074 Add the --color-words option to the diff options family
37075 builtin-mv: readability patch
37076 unpack-objects: remove unused variable "eof"
37078 Remove uneeded #include
37079 fmt-merge-msg: fix off-by-one bug
37080 Teach runstatus about --untracked
37081 add receive.denyNonFastforwards config variable
37082 receive-pack: plug memory leak in fast-forward checking code.
37083 Document receive.denyNonFastforwards
37084 runstatus: do not recurse into subdirectories if not needed
37085 daemon: default to 256 for HOST_NAME_MAX if it is not defined
37086 diff --stat: ensure at least one '-' for deletions, and one '+' for additions
37089 Add virtualization support to git-daemon
37090 Cleaned up git-daemon virtual hosting support.
37091 Removed memory leaks from interpolation table uses.
37093 Jonas Fonseca (21):
37094 git-apply(1): document missing options and improve existing ones
37095 git-ls-remote(1): document --upload-pack
37096 git-blame(1): mention options in the synopsis and advertise pickaxe
37097 gitk(1): expand the manpage to look less like a template
37098 git(7): put the synopsis in a verse style paragraph
37099 gitview.txt: improve asciidoc markup
37100 git-svn(1): improve asciidoc markup
37101 describe: fix off-by-one error in --abbrev=40 handling
37102 Use PATH_MAX instead of MAXPATHLEN
37103 Use xrealloc instead of realloc
37104 Use fstat instead of fseek
37105 Use xcalloc instead of calloc
37106 Add --relative-date option to the revision interface
37107 git(7): move gitk(1) to the list of porcelain commands
37108 Use xmalloc instead of malloc
37109 Include config.mak.autogen in the doc Makefile
37110 git-rev-list(1): group options; reformat; document more options
37111 git-apply(1): document --unidiff-zero
37112 git-repack(1): document --window and --depth
37113 Fix trivial typos and inconsistencies in hooks documentation
37114 gitk(1): mention --all
37116 Junio C Hamano (125):
37117 Perl interface: add build-time configuration to allow building with -fPIC
37118 Perl interface: make testsuite work again.
37119 perl: fix make clean
37120 Git.pm: tentative fix to test the freshly built Git.pm
37121 Perly Git: arrange include path settings properly.
37122 Makefile: Set USE_PIC on x86-64
37123 Perly git: work around buggy make implementations.
37124 Git.pm: clean generated files.
37125 Perly Git: make sure we do test the freshly built one.
37126 INSTALL: a tip for running after building but without installing.
37127 Work around sed and make interactions on the backslash at the end of line.
37128 upload-pack: use object pointer not copy of sha1 to keep track of has/needs.
37129 upload-pack: lift MAX_NEEDS and MAX_HAS limitation
37130 recur vs recursive: help testing without touching too many stuff.
37131 sha1_file.c: expose map_sha1_file() interface.
37132 pack-objects: reuse deflated data from new-style loose objects.
37133 unpack-objects: read configuration data upon startup.
37134 Makefile: git-merge-recur depends on xdiff libraries.
37135 gitweb: There can be more than two levels of subdirectories
37136 gitweb: an obvious cut and paste error.
37137 gitweb: fix use of uninitialized value.
37138 gitweb: when showing history of a tree, show tree link not blob
37139 gitweb: avoid undefined value warning in print_page_path
37140 gitweb/README: do not bug Kay with gitweb questions anymore
37141 Makefile: gitweb/gitweb.cgi is now generated.
37142 gitweb: do not use @@FOO@@ for replaced tokens
37143 .gitignore: git-merge-recur is a built file.
37144 Make git-checkout-index a builtin
37145 builtins: Makefile clean-up
37146 git.c: Rename NEEDS_PREFIX to RUN_SETUP
37147 autoconf: fix NEEDS_SSL_WITH_CRYPTO
37149 Racy git: avoid having to be always too careful
37150 read-cache: tweak racy-git delay logic
37151 autoconf: clean temporary file mak.append
37152 git-grep: show pathnames relative to the current directory
37153 upload-pack: minor clean-up in multi-ack logic
37154 Fix type of combine-diff.c::show_patch_diff()
37155 Remove combine-diff.c::uninteresting()
37156 t4116 apply --reverse test
37157 git-apply --reverse: simplify reverse option.
37158 git-apply --binary: clean up and prepare for --reverse
37160 Documentation/technical/racy-git.txt
37161 Add check program "git-check-racy"
37162 Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
37163 builtin-grep: remove unused debugging cruft.
37164 builtin-apply --reverse: two bugfixes.
37165 diff.c: make binary patch reversible.
37166 apply --reverse: tie it all together.
37168 git-apply --reject: send rejects to .rej files.
37169 git-apply --verbose
37170 apply --reject: count hunks starting from 1, not 0
37171 Convert memset(hash,0,20) to hashclr(hash).
37172 hashcpy/hashcmp remaining bits.
37173 builtin-grep.c: remove unused debugging piece.
37175 git-apply --reject: finishing touches.
37176 free(NULL) is perfectly valid.
37177 daemon: prepare for multiple services.
37178 daemon: add upload-tar service.
37179 multi-service daemon: documentation
37180 t5710: fix two thinkos.
37181 Constness tightening for move/link_temp_to_file()
37182 consolidate two copies of new style object header parsing code.
37183 pack-objects: re-validate data we copy from elsewhere.
37184 Revert "Convert git-annotate to use Git.pm"
37185 Revert "Git.pm: Introduce fast get_object() method"
37186 Revert "Make it possible to set up libgit directly (instead of from the environment)"
37187 pack-objects: fix thinko in revalidate code
37188 more lightweight revalidation while reusing deflated stream in packing
37189 unpack-objects desperately salvages objects from a corrupt pack
37190 revision.c: allow injecting revision parameters after setup_revisions().
37191 Teach rev-list an option to read revs from the standard input.
37192 Revert "daemon: add upload-tar service."
37193 Make apply --binary a no-op.
37194 diff --binary generates full index on binary files.
37195 Separate object listing routines out of rev-list
37196 pack-objects: run rev-list equivalent internally.
37197 pack-objects: further work on internal rev-list logic.
37198 pack-objects --unpacked=<existing pack> option.
37199 get_sha1_hex() micro-optimization
37200 archive: allow remote to have more formats than we understand.
37201 Move sideband client side support into reusable form.
37202 Move sideband server side support into reusable form.
37203 archive: force line buffered output to stderr
37204 Add --verbose to git-archive
37205 Teach --exec to git-archive --remote
37206 Prepare larger packet buffer for upload-pack protocol.
37207 Add sideband status report to git-archive protocol
37208 upload-archive: monitor child communication more carefully.
37209 builtin-archive.c: rename remote_request() to extract_remote_arg()
37210 pack-objects: document --revs, --unpacked and --all.
37211 http-fetch: fix alternates handling.
37212 unpack-objects -r: call it "recover".
37213 Document git-grep -[Hh]
37214 Define fallback PATH_MAX on systems that do not define one in <limits.h>
37215 Fix git-am safety checks
37216 http-fetch.c: consolidate code to detect missing fetch target
37217 Add ftp:// protocol support for git-http-fetch
37218 t1400: make test debuggable.
37219 apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches
37220 builtin-grep: make pieces of it available as library.
37221 revision traversal: prepare for commit log match.
37222 revision traversal: --author, --committer, and --grep.
37223 repack: use only pack-objects, not rev-list.
37224 Update grep internal for grepping only in head/body
37225 git log: Unify header_filter and message_filter into one.
37226 Make hexval() available to others.
37227 sha1_name.c: understand "describe" output as a valid object name
37228 diff.c: second war on whitespace.
37229 git-apply: second war on whitespace.
37230 Add t5510 to test per branch configuration affecting git-fetch.
37231 Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
37232 Deprecate merge-recursive.py
37233 diff --stat: allow custom diffstat output width.
37234 diff --stat: color output.
37235 An illustration of rev-list --parents --pretty=raw
37236 grep: free expressions and patterns when done.
37237 grep: fix --fixed-strings combined with expression.
37238 Contributed bash completion support for core Git tools.
37239 git-diff -B output fix.
37240 Remove -fPIC which was only needed for Git.xs
37243 Linus Torvalds (10):
37244 Relative timestamps in git log
37245 git-fsck-objects: lacking default references should not be fatal
37246 Fix git-fsck-objects SIGSEGV/divide-by-zero
37247 Add "-h/-H" parsing to "git grep"
37248 Allow multiple "git_path()" uses
37249 git-log --author and --committer are not left-anchored by default
37250 Clean up approxidate() in preparation for fixes
37251 Fix approxidate() to understand more extended numbers
37252 diff --stat=width[,name-width]: allow custom diffstat output width.
37253 Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
37256 Fix duplicate xmalloc in builtin-add
37259 gitweb: git_tree displays blame based on repository config
37260 gitweb: bugfix: git_commit and git_commitdiff parents
37261 gitweb: blame table row no highlight fix
37262 gitweb: bugfix: commitdiff regression
37263 gitweb: bugfix: git_print_page_path() needs the hash base
37264 gitweb: tree view: eliminate redundant "blob"
37265 gitweb: Remove redundant "tree" link
37266 gitweb: extend blame to show links to diff and previous
37267 Revert "gitweb: extend blame to show links to diff and previous"
37268 gitweb: Remove excessively redundant entries from git_difftree_body
37269 gitweb: Add history and blame to git_difftree_body()
37270 gitweb: "alternate" starts with shade (i.e. 1)
37271 gitweb: Remove redundant "commit" link from shortlog
37272 gitweb: Factor out gitweb_have_snapshot()
37273 gitweb: Add snapshot to shortlog
37274 gitweb: Don't use quotemeta on internally generated strings
37275 gitweb: Remove redundant "commit" from history
37276 gitweb: History: blob and tree are first, then commitdiff, etc
37277 gitweb: tree view: hash_base and hash are now context sensitive
37279 Martin Langhoff (1):
37280 git-repack: create new packs inside $GIT_DIR, not cwd
37283 gitweb: fill in gitweb configuration by Makefile
37284 gitweb: use out-of-line GIT logo.
37285 gitweb: provide function to format the URL for an action link.
37286 gitweb: consolidate action URL generation.
37287 gitweb: continue consolidation of URL generation.
37288 gitweb: support for "fp" parameter.
37289 gitweb: support for / as home_link.
37290 gitweb: fix project list if PATH_INFO=="/".
37291 gitweb: more support for PATH_INFO based URLs
37292 gitweb: fix uninitialized variable warning.
37293 gitweb: fix display of trees via PATH_INFO.
37295 Matthias Kestenholz (6):
37296 Make git-name-rev a builtin
37297 Make git-pack-objects a builtin
37298 Make git-unpack-objects a builtin
37299 Make git-symbolic-ref a builtin
37300 Add gitweb.cgi to .gitignore
37301 Check if pack directory exists prior to descending into it
37303 Matthias Lederhofer (12):
37304 pager: environment variable GIT_PAGER to override PAGER
37305 gitweb: use a hash to lookup the sub for an action
37306 gitweb: require $ENV{'GITWEB_CONFIG'}
37307 gitweb: check if HTTP_ACCEPT is really set
37308 gitweb: fix commitdiff_plain for root commits
37309 gitweb: fix $project usage
37310 gitweb: do not use 'No such directory' error message
37311 gitweb: export options
37312 gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
37313 gitweb fix validating pg (page) parameter
37314 format-patch: use cwd as default output directory
37315 git-format-patch: fix bug using -o in subdirectories
37318 move pack creation to version 3
37319 many cleanups to sha1_file.c
37321 Paul Mackerras (10):
37322 gitk: Minor cleanups
37323 gitk: Recompute ancestor/descendent heads/tags when rereading refs
37324 gitk: Add a row context-menu item for creating a new branch
37325 gitk: Add a context menu for heads
37326 gitk: Fix a couple of buglets in the branch head menu items
37327 gitk: Add a menu item for cherry-picking commits
37328 gitk: Update preceding/following tag info when creating a tag
37329 gitk: Improve responsiveness while reading and layout out the graph
37330 gitk: Fix some bugs in the new cherry-picking code
37331 diff-index --cc shows a 3-way diff between HEAD, index and working tree.
37334 Fix probing for already installed Error.pm
37335 Delete manuals if compiling without docs
37336 Make perl interface a separate package
37339 Introduce Git.pm (v4)
37340 Git.pm: Implement Git::exec_path()
37341 Git.pm: Call external commands using execv_git_cmd()
37342 Git.pm: Implement Git::version()
37343 Add Error.pm to the distribution
37344 Git.pm: Better error handling
37345 Git.pm: Handle failed commands' output
37346 Git.pm: Enhance the command_pipe() mechanism
37347 Git.pm: Implement options for the command interface
37348 Git.pm: Add support for subdirectories inside of working copies
37349 Convert git-mv to use Git.pm
37350 Git.pm: assorted build related fixes.
37351 Git.pm: Try to support ActiveState output pipe
37352 Git.pm: Swap hash_object() parameters
37353 Git.pm: Fix Git->repository("/somewhere/totally/elsewhere")
37354 Git.pm: Support for perl/ being built by a different compiler
37355 Git.pm: Remove PerlIO usage from Git.xs
37356 Git.pm: Avoid ppport.h
37357 Git.pm: Don't #define around die
37358 Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
37359 Git.pm: Add config() method
37360 Convert git-send-email to use Git.pm
37361 Git.pm: Introduce ident() and ident_person() methods
37362 Make it possible to set up libgit directly (instead of from the environment)
37363 Git.pm: Introduce fast get_object() method
37364 Convert git-annotate to use Git.pm
37365 Eliminate Scalar::Util usage from private-Error.pm
37366 Fix showing of path in tree view
37367 gitweb: Link (HEAD) tree for each project from projects list
37368 gitweb: More per-view navigation bar links
37369 gitweb: Link to tree instead of snapshot in shortlog
37370 gitweb: Link to latest tree from the head line in heads list
37371 gitweb: Link to associated tree from a particular log item in full log view
37372 gitweb: Rename "plain" labels to "raw"
37373 gitweb: Relabel "head" as "HEAD"
37374 Make path in tree view look nicer
37375 gitweb: Fix tree link associated with each commit log entry.
37376 gitweb: Fix @git_base_url_list usage
37377 Fix snapshot link in tree view
37378 Git.pm: Kill Git.xs for now
37379 Deprecate git-resolve.sh
37380 gitweb: Consolidate escaping/validation of query string
37381 gitweb: fix over-eager application of esc_html().
37383 Pierre Habouzit (7):
37384 Fix a comparison bug in diff-delta.c
37385 avoid to use error that shadows the function name, use err instead.
37386 git_dir holds pointers to local strings, hence MUST be const.
37387 missing 'static' keywords
37388 remove ugly shadowing of loop indexes in subloops.
37389 use name[len] in switch directly, instead of creating a shadowed variable.
37390 n is in fact unused, and is later shadowed.
37392 Randal L. Schwartz (1):
37393 builtin-upload-archive.c broken on openbsd
37396 git-verify-pack: make builtin
37398 Add write_or_die(), a helper function
37400 git-cherry: remove unused variable
37401 git-reset: remove unused variable
37402 Add git-zip-tree to .gitignore
37403 git-archive: make compression level of ZIP archives configurable
37404 Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c
37405 git-archive: inline default_parse_extra()
37406 git-tar-tree: devolve git-tar-tree into a wrapper for git-archive
37407 Remove git-zip-tree
37408 Rename builtin-zip-tree.c to archive-zip.c
37409 git-tar-tree: Remove duplicate git_config() call
37410 git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
37412 Robin Rosenberg (2):
37413 Quote arguments to tr in test-lib
37414 Make cvsexportcommit remove files.
37417 Fetch: default remote repository from branch properties
37418 fetch: get the remote branches to merge from the branch properties
37419 Add test for the default merges in fetch.
37420 fetch: Reset remote refs list each time fetch_main is called
37422 Sasha Khapyorsky (3):
37423 Trivial support for cloning and fetching via ftp://.
37424 git-svnimport: Parse log message for Signed-off-by: lines
37425 http/ftp: optionally ask curl to not use EPSV command
37428 Documentation: Fix howto/revert-branch-rebase.html generation
37429 git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
37431 Shawn O. Pearce (15):
37432 Verify we know how to read a pack before trying to using it.
37433 Remove unnecessary forward declaration of unpack_entry.
37434 Convert memcpy(a,b,20) to hashcpy(a,b).
37435 Convert memcpy(a,b,20) to hashcpy(a,b).
37436 Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
37437 Reuse compression code in unpack_compressed_entry.
37438 Cleanup unpack_entry_gently and friends to use type_name array.
37439 Cleanup unpack_object_header to use only offsets.
37440 Convert unpack_entry_gently and friends to use offsets.
37441 Replace uses of strdup with xstrdup.
37442 Allow 'svn fetch' on '(no date)' revisions in Subversion.
37443 Allow '(no author)' in git-svn's authors file.
37444 Ignore executable bit when adding files if filemode=0.
37445 Allow git-checkout when on a non-existant branch.
37446 Corrected copy-and-paste thinko in ignore executable bit test case.
37448 Tilman Sauerbeck (2):
37450 Added support for dropping privileges to git-daemon.
37453 --name-only, --name-status, --check and -s are mutually exclusive
37454 Remove awkward compatibility warts
37457 Be nicer if git executable is not installed
37460 gitweb: configurable home link string
37461 gitweb: Decode long title for link tooltips
37464 Version v1.4.2.4; changes since v1.4.2.3:
37465 -----------------------------------------
37467 Linus Torvalds (1):
37468 Fix hash function in xdiff library
37471 Version v1.4.2.3; changes since v1.4.2.2:
37472 -----------------------------------------
37474 Junio C Hamano (2):
37475 git-mv: invalidate the removed path properly in cache-tree
37476 git-push: .git/remotes/ file does not require SP after colon
37479 Version v1.4.2.2; changes since v1.4.2.1:
37480 -----------------------------------------
37482 Junio C Hamano (2):
37483 Fix git-am safety checks
37484 git-diff -B output fix.
37487 Fix duplicate xmalloc in builtin-add
37490 Version v1.4.2.1; changes since v1.4.2:
37491 ---------------------------------------
37493 Dennis Stosberg (1):
37494 Solaris does not support C99 format strings before version 10
37496 Johannes Schindelin (5):
37497 git-mv: succeed even if source is a prefix of destination
37498 git-mv: add more path normalization
37499 git-mv: special case destination "."
37500 git-mv: fix off-by-one error
37501 builtin-mv: readability patch
37503 Junio C Hamano (2):
37504 finish_connect(): thinkofix
37505 http-fetch: fix alternates handling.
37508 Fix regex pattern in commit-msg
37509 sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
37512 Version v1.4.2; changes since v1.4.2-rc4:
37513 -----------------------------------------
37516 git-svn: correctly kill keyword expansion without munging EOLs
37517 git-svn: bugfix: allow SVN:: lib users to track the root of the repository
37518 git-svn: split the path from the url correctly with limited perms
37520 Junio C Hamano (8):
37521 git-apply: applying a patch to make a symlink shorter.
37522 combine-diff: use color
37524 builtin-apply: remove unused increment
37525 git-sh-setup: do not use repo-config to test the git directory
37526 git-am: give better diagnostics when the patch does not apply during --3way
37527 Better error message when we are unable to lock the index file
37528 t/t4013: fix futzing with the version string.
37530 Matthias Lederhofer (1):
37531 upload-pack: fix timeout in create_pack_file
37533 Paul Mackerras (2):
37534 gitk: Allow the user to set some colors
37535 gitk: Show the currently checked-out head in bold font
37537 Ramsay Allan Jones (1):
37538 Fix header breakage with _XOPEN_SOURCE.
37541 Add has_extension()
37542 git-verify-pack: show usage when no pack was specified
37543 git-verify-pack: more careful path handling
37544 git-verify-pack: insist on .idx extension
37545 git-verify-pack: get rid of while loop
37546 git-verify-pack: free pack after use and a cleanup
37547 git-verify-pack: buffer overrun paranoia
37548 git-verify-pack: no need to count errors
37549 drop length argument of has_extension
37551 Rutger Nijlunsing (2):
37552 http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
37553 Add Documentation/howto/setup-git-server-over-http.txt
37556 Version v1.4.2-rc4; changes since v1.4.2-rc3:
37557 ---------------------------------------------
37560 git-push: allow pushing from subdirectories
37562 Johannes Schindelin (1):
37563 Fix crash when GIT_DIR is invalid
37566 Update git-init-db(1) and documentation of core.sharedRepository
37568 Junio C Hamano (13):
37569 Cygwin needs NO_C99_FORMAT???
37570 Further clean-up: usage() vs die()
37571 Makefile: Cygwin does not seem to need NO_STRLCPY
37573 debugging: XMALLOC_POISON
37574 builtin-mv: fix use of uninitialized memory.
37575 GIT-VERSION-GEN: adjust for ancient git
37576 Documentation: git-status takes the same options as git-commit
37577 Fix tutorial-2.html
37578 check return value from diff_setup_done()
37579 find_unique_abbrev() with len=0 should not abbreviate
37580 make --find-copies-harder imply -C
37581 allow diff.renamelimit to be set regardless of -M/-C
37583 Michael Krelin (1):
37584 handle https:// protocol in git-clone
37586 Ramsay Allan Jones (4):
37587 Fixup command names in some usage strings.
37588 Replace some calls to die(usage_str) with usage(usage_str).
37589 Allow config file to specify Signed-off-by identity in format-patch.
37590 commit walkers: setup_ident() to record correct committer in ref-log.
37593 git-tar-tree: fix minor memory leak
37596 log-tree: show_log() should respect the setting of diffopt->line_termination
37597 annotate: Fix bug when parsing merges with differing real and logical parents.
37599 Uwe Zeisberger (1):
37600 Document rev-list's option --merge
37603 Version v1.4.2-rc3; changes since v1.4.2-rc2:
37604 ---------------------------------------------
37607 Build on Debian GNU/kFreeBSD
37609 Jakub Narębski (11):
37610 Allow INSTALL, bindir, mandir to be set in main Makefile
37611 Rename man1 and man7 variables to man1dir and man7dir
37612 autoconf: Use autoconf to write installation directories to config.mak.autogen
37613 Teach make clean about configure and autoconf
37614 Copy description of build configuration variables to configure.ac
37615 autoconf: Preparing the way for autodetection
37616 autoconf: Checks for typedefs, structures, and compiler characteristics.
37617 autoconf: Checks for some library functions.
37618 autoconf: Checks for libraries
37619 autoconf: Checks for some programs
37620 configure.ac vertical whitespace usage cleanup
37623 git-push: allow -f as an alias for --force
37624 git-push: remove obsolete git-push.sh
37625 Documentation: convert uses of git-link macro to gitlink
37626 git-annotate: remove extraneous debugging line
37628 Johannes Schindelin (16):
37629 Allow an alias to start with "-p"
37630 git wrapper: add --git-dir=<path> and --bare options
37631 git-instaweb: some Apache have mod_cgi builtin
37632 git-instaweb: respect bindir from Makefile
37633 gitweb: fix two warnings
37634 t7001: add test for git-mv dir1 dir2/
37635 git-cvsserver: support multiline commit messages
37636 Extract helper bits from c-merge-recursive work
37637 Make git-mv a builtin
37638 builtin git-mv: support moving directories
37639 instaweb: Be more clear if httpd or the browser fail
37640 cvsserver: imitate git-update-ref when committing
37641 Makefile: ssh-pull.o depends on ssh-fetch.c
37642 Teach git-apply about '-R'
37644 tar-tree: illustrate an obscure feature better
37646 Josef Weidendorfer (1):
37647 Extend testing git-mv for renaming of subdirectories
37649 Junio C Hamano (18):
37650 git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
37651 t4112: simplify the test and remove unneeded working tree file.
37652 lost-found: use fsck-objects --full
37653 git-reset: detect update-ref error and report it.
37654 log and diff family: honor config even from subdirectories
37655 git-apply -R: binary patches are irreversible for now.
37656 t4103: fix binary patch application test.
37657 git-checkout: allow "checkout HEAD -- path"
37658 Builtins: control the use of pager from the command table.
37659 fetch/clone: mark messages from remote side stand out.
37660 Fix "git diff blob1 blob2" showing the diff in reverse.
37661 read-tree: shadowed variable fix.
37662 Add a couple of subdirectory tests.
37663 diff.c: do not use pathname comparison to tell renames
37664 Show both blob names from "git diff blob1 blob2"
37665 sideband: do not use color, just say "remote:"
37666 Documentation/git.txt: link git-svn and git-instaweb from the main page.
37669 Linus Torvalds (4):
37670 Call setup_git_directory() early
37671 Call setup_git_directory() much earlier
37672 Fix double "close()" in ce_compare_data
37673 Fix up some fallout from "setup_git_directory()" cleanups
37676 gitweb.cgi: Teach git_history() to read hash from $hash_base
37677 gitweb.cgi: Include direct link to "raw" files from "history"
37678 gitweb.cgi: git_blame2: an alternative simple working git blame
37679 gitweb.cgi: git_blame2: Allow back-trekking through commits
37680 gitweb.cgi: Show "raw" head of project link even when $hash is not defined
37681 gitweb.cgi: git_blame2: Revision blocks now have alternating colors
37682 gitweb.cgi: Centralize printing of the page path
37683 gitweb.cgi: git_blame2: slight optimization reading the blame lines
37685 Matthias Kestenholz (3):
37686 Make git-prune-packed a builtin
37687 Make git-repo-config a builtin
37688 use declarations from builtin.h for builtin commands
37690 Matthias Lederhofer (5):
37691 daemon: documentation for --reuseaddr, --detach and --pid-file
37692 setup_git_directory_gently: do not barf when GIT_DIR is given.
37693 git.c: allow alias expansion without a git directory
37694 pager: config variable pager.color
37695 git-grep: document --and, --or, --not, ( and )
37697 Michael S. Tsirkin (1):
37698 mailinfo: accept >From in message header
37700 Michele Ballabio (1):
37701 fixed variable declaration in gitk
37704 Typofix in configure.ac comment.
37705 Quote all calls to GIT_CONF_APPEND_LINE
37706 Set datarootdir in config.mak.in
37709 Remove -d from *-fetch usage strings
37710 Make pull() take some implicit data as explicit arguments
37711 Make pull() support fetching multiple targets at once
37712 Teach git-local-fetch the --stdin switch
37713 Teach git-http-fetch the --stdin switch
37715 Ramsay Allan Jones (7):
37716 Ensure git-clone exits with error if perl script fails.
37717 Fix annotate test script; notice when git-annotate fails.
37718 Fix installation of templates on ancient systems.
37719 New tests and en-passant modifications to mktag.
37720 Add NO_C99_FORMAT to support older compilers.
37721 Fix header breakage due to redefining PATH_MAX.
37722 Remove cmd_usage() routine and re-organize the help/usage code.
37724 Robert Shearman (2):
37725 rebase: Fix the detection of fast-forwarding of the current branch to upstream.
37726 rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
37728 Shawn O. Pearce (1):
37729 Display an error from update-ref if target ref name is invalid.
37732 Version v1.4.2-rc2; changes since v1.4.2-rc1:
37733 ---------------------------------------------
37736 Trivial path optimization test
37738 Alexandre Julliard (5):
37739 git.el: Run git-rerere on commits if the rr-cache directory exists.
37740 git.el: Prepend a slash to the file name when adding to .gitignore.
37741 git.el: Try to reuse an existing buffer when running git-status.
37742 git.el: Put the git customize group in the 'tools' parent group.
37743 show-branch: Fix another performance problem.
37746 gitweb: escape tag comments
37749 typechange tests for git apply (currently failing)
37750 git-svn: fix fetching new directories copies when using SVN:: libs
37753 pack-objects: check pack.window for default window size
37754 Colorize 'commit' lines in log ui
37756 Johannes Schindelin (4):
37757 Fix t4114 on cygwin
37758 Always reset the color _before_ printing out the newline
37759 cvsserver: suppress warnings
37760 cvsserver: avoid warning about active db handles
37763 git-format-patch: Make the second and subsequent mails replies to the first
37764 Add option to enable threading headers
37765 Add option to set initial In-Reply-To/References
37767 Junio C Hamano (8):
37768 fetch/clone: check return status from ls-remote
37769 builtin-log: typefix for recent format-patch changes.
37770 checkout -f failed to check out a file if an existing directory interfered.
37771 apply: check D/F conflicts more carefully.
37772 apply: split out removal and creation into different phases.
37773 apply: handle type-changing patch correctly.
37774 git-fetch: fix --keep vs --thin
37775 unpack-objects: remove stale and confusing comment
37777 Linus Torvalds (1):
37778 sha1_file: add the ability to parse objects in "pack file format"
37780 Lukas Sandström (1):
37781 git-am: Don't accept an mbox on stdin of we already have a .dotest directory
37783 Martin Langhoff (1):
37784 cvsexportcommit - add -a (add author line) flag, cleanup warnings
37786 Matthias Lederhofer (1):
37787 upload-pack: fix timeout in create_pack_file
37790 Substitute xmalloc()+memset(0) with xcalloc().
37793 Defaulting fetch to origin when set in the repo-config
37795 Shawn O. Pearce (1):
37796 Disable linking with Fink or DarwinPorts.
37799 tar-tree: add the "tar.umask" config option
37802 Version v1.4.2-rc1; changes since v1.4.1.1:
37803 -------------------------------------------
37805 A Large Angry SCM (1):
37806 Additional merge-base tests (revised)
37809 Do not use perl in git-commit.sh
37812 Fix some doubled word typos
37813 Fix some doubled word typos
37814 Fix typos involving the word 'commit'
37815 typofix (git-name-rev documentation)
37816 git-send-email: Remove redundant Reply-To header
37817 gitweb: Send XHTML as 'application/xhtml+xml' where possible
37818 gitweb: Include a site name in page titles
37819 gitweb: Make command invocations go through the git wrapper
37820 documentation (urls.txt) typofix
37822 Dennis Stosberg (2):
37823 gitweb: Declare global variables with "our"
37824 gitweb: Declare global variables with "our"
37827 Add git-instaweb, instantly browse the working repo with gitweb
37828 instaweb: fix unportable ';' usage in sed
37829 t8001-annotate: fix a bash-ism in this test
37830 git-svn: avoid fetching files outside of the URL we're tracking
37831 git-svn: migrate out of contrib
37832 builtin-log: respect diff configuration options
37833 diff.c: respect diff.renames config option
37834 templates/hooks--update: replace diffstat calls with git diff --stat
37835 git-svn: fix --file/-F option in commit-diff
37836 tests: Set EDITOR=: and VISUAL=: globally
37837 git-fetch: fix a bashism (==)
37838 git-svn: don't check for migrations/upgrades on commit-diff
37840 Jakub Narębski (3):
37841 send-email: format 2822 datestring ourselves.
37842 Wrap long lines in docstrings in contrib/emacs/git.el
37843 Display help for Git mode after pressing `h' or `?' in *git-status*
37845 Joachim Berdal Haga (2):
37846 Make zlib compression level configurable, and change default.
37847 core.compression documentation formatting fix.
37849 Johannes Schindelin (7):
37850 refactor merge_bases() as preparation to libify merge-base
37851 move get_merge_bases() to core lib.
37852 Makefile: replace ugly and unportable sed invocation
37853 Make git-fmt-merge-msg a builtin
37854 Makefile: export NO_SVN_TESTS
37855 Close the index file between writing and committing
37856 Fix linking for not-so-clever linkers.
37859 Documentation/urls.txt: Use substitution to escape square brackets
37861 Junio C Hamano (49):
37862 Makefile: add framework to verify and bench sha1 implementations.
37863 test-sha1: test hashing large buffer
37864 t4013: add tests for diff/log family output options.
37865 t4013: add more tests around -c and --cc
37866 Fix some more diff options changes.
37867 t4013 test updates for new output code.
37868 combine-diff.c: type sanity.
37869 format-patch: fix diff format option implementation
37870 t4013: add format-patch tests.
37871 t4013: note improvements brought by the new output code.
37872 gitweb: optimize per-file history generation
37873 gitweb: optimize per-file history generation
37874 t4013: add "diff" UI program tests.
37875 builtin-diff: turn recursive on when defaulting to --patch format.
37876 commit.c: do not redefine UNINTERESTING bit.
37877 get_merge_bases: clean up even when there is no common commit.
37878 revert clear-commit-marks for now.
37879 boolean: accept yes and no as well
37880 send-email: do not barf when Term::ReadLine does not like your terminal
37881 t6200: fmt-merge-msg test.
37882 git-grep: fix parsing of pathspec separator '--'
37883 git-grep: fix exit code when we use external grep.
37884 git-grep: use a bit more specific error messages.
37885 Re-fix clear_commit_marks().
37886 git-grep: boolean expression on pattern matching.
37887 git-reset: complain and exit upon seeing an unknown parameter.
37888 mailinfo: assume input is latin-1 on the header as we do for the body
37889 diffcore-rename: try matching up renames without populating filespec first.
37890 builtin-rev-parse.c: constness tightening
37891 show-branch: match documentation and usage
37892 rev-parse documentation: talk about range notation.
37893 git-svn: migrate out of contrib (follow-up)
37894 diff.c: --no-color to defeat diff.color configuration.
37895 Update diff-options and config documentation.
37896 git log -p --merge [[--] paths...]
37897 colored diff: diff.color = auto fix
37898 diff: do not use configuration magic at the core-level
37899 "git -p cmd" to page anywhere
37900 merge-base: update the clean-up postprocessing
37902 Fix grammatical error in git-revert
37903 git-repack: avoid redirecting stderr into git-pack-objects
37904 test-lib: unset GIT_TRACE
37905 t4013 diff format tests update
37906 Adjust t4013 tests to corrected format-patch.
37907 Documentation: Fix ssh://[user@]host.xz URL
37908 builtin-prune.c: forgot TYPE => OBJ changes.
37909 Documentation/Makefile: product depends on asciidoc.conf
37910 show-branch: fix performance problem.
37912 Linus Torvalds (7):
37913 xdiff: generate "anti-diffs" aka what is common to two files
37914 Prepare "git-merge-tree" for future work
37915 Improved three-way blob merging code
37916 Improve git-peek-remote
37917 builtin "git prune"
37918 Make the unpacked object header functions static to sha1_file.c
37919 Remove TYPE_* constant macros and use object_type enums consistently.
37922 gitweb: Enable tree (directory) history display
37923 gitweb: Enable tree (directory) history display
37924 Add "raw" output option to blobs in "tree" view format
37925 gitweb.cgi: Create $git_temp if it doesn't exist
37926 gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
37927 gitweb.css: Use monospace fonts for commits and tree-diff.
37929 Matthias Lederhofer (10):
37930 GIT_TRACE: show which built-in/external commands are executed
37931 change ent to tree in git-diff documentation
37932 git-rev-list: add documentation for --parents, --no-merges
37933 daemon: use a custom die routine with syslog
37934 daemon: if one of the standard fds is missing open it to /dev/null
37935 upload-pack: ignore write errors to stderr
37936 daemon: new option --pid-file=<path> to store the pid
37937 daemon: new option --detach to run git-daemon in background
37938 Documentation about exclude/ignore files
37939 argv created by handle_alias should be NULL terminated
37942 sed -e '/RE/r rfile/' needs space in 'r rfile'
37943 Using 'perl' in *.sh
37946 Assorted typo fixes
37947 Typofix in Makefile comment.
37948 Fix more typos, primarily in the code
37949 Avoid C99 comments, use old-style C comments instead.
37952 git-cvsexportcommit can't handle merge commits correctly
37955 Add get_merge_bases_clean()
37956 Add '...' operator for revisions
37957 Make clear_commit_marks() clean harder
37958 Fold get_merge_bases_clean() into get_merge_bases()
37959 rev-list: free commit_list in ... handler
37961 Robert Shearman (1):
37962 format-patch: Generate a newline between the subject header and the message body
37965 annotate: Support annotation of files on other revisions.
37966 annotate: Correct most merge following to annotate correctly.
37967 Disable color detection during format-patch
37970 Teach rev-parse the ... syntax.
37973 Fix "git-fetch --tags" exit status when nothing has been changed
37975 Shawn O. Pearce (9):
37976 Avoid C99 initializers
37977 Allow user.name and user.email to drive reflog entry.
37978 Record the type of commit operation in the reflog.
37979 Log ref changes made by git-fetch and git-pull.
37980 Log ref changes made by git-merge and git-pull.
37981 Log ref changes made by quiltimport.
37982 Log ref changes made by resolve.
37983 Make lazy mkdir more robust.
37984 Record rebase changes as 'rebase' in the reflog.
37987 Do not drop data from '\0' until eol in patch output
37988 Teach --text option to diff
37989 Teach diff -a as shorthand for --text
37990 Add -a and --text to common diff options help
37991 diff-options: Explain --text and -a
37993 Timo Hirvonen (14):
37994 Merge with_raw, with_stat and summary variables to output_format
37995 Make --raw option available for all diff commands
37996 Set default diff output format after parsing command line
37997 DIFF_FORMAT_RAW is not default anymore
37998 Add msg_sep to diff_options
37999 Don't xcalloc() struct diffstat_t
38000 whatchanged: Default to DIFF_FORMAT_RAW
38001 Print empty line between raw, stat, summary and patch
38002 diff-tree: Use ---\n as a message separator
38003 log --raw: Don't descend into subdirectories by default
38005 GIT_TRACE: fix a mixed declarations and code warning
38006 diff: Support both attributes and colors
38007 diff: Support 256 colors
38010 Fix print-log and diff compatibility with recent vc versions
38013 Mention the [user@] part in documentation of ssh:// urls.
38016 A better-scheduled PPC SHA-1 implementation.
38019 Version v1.4.1.1; changes since v1.4.1:
38020 ---------------------------------------
38022 Junio C Hamano (1):
38023 Makefile: tighten git-http-{fetch,push} dependencies
38025 Linus Torvalds (1):
38026 revision.c: fix "dense" under --remove-empty
38028 Matthias Lederhofer (1):
38029 upload-pack: fix timeout in create_pack_file
38031 Robin Rosenberg (1):
38032 Empty author may be presented by svn as an empty string or a null value.
38035 Version v1.4.1; changes since v1.4.1-rc2:
38036 -----------------------------------------
38039 git-svn: allow a local target directory to be specified for init
38041 Johannes Schindelin (4):
38042 add diff_flush_patch_id() to calculate the patch id
38043 format-patch: introduce "--ignore-if-in-upstream"
38044 t4014: fix for whitespace from "wc -l"
38045 format-patch: use clear_commit_marks() instead of some ad-hockery
38047 Junio C Hamano (6):
38048 git-repack: Be careful when updating the same pack as an existing one.
38049 t4014: add format-patch --ignore-if-in-upstream test
38050 t4014: fix test commit labels.
38051 diff.c: fix get_patch_id()
38053 upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
38055 Linus Torvalds (4):
38056 Do not try futile object pairs when repacking.
38057 Abstract out accesses to object hash array
38058 revision.c: --full-history fix.
38059 git object hash cleanups
38062 consider previous pack undeltified object state only when reusing delta data
38063 don't load objects needlessly when repacking
38066 Fix errno usage in connect.c
38068 Robin Rosenberg (1):
38069 Minor documentation fixup.
38072 Version v1.4.1-rc2; changes since v1.4.1-rc1:
38073 ---------------------------------------------
38075 Andreas Ericsson (1):
38076 git wrapper: fix command name in an error message.
38078 Dennis Stosberg (3):
38079 Solaris needs inclusion of signal.h for signal()
38080 Fix pkt-line.h to compile with a non-GCC compiler
38081 Fix expr usage for FreeBSD
38084 rebase: allow --merge option to handle patches merged upstream
38085 rebase: cleanup rebasing with --merge
38086 rebase: allow --skip to work with --merge
38087 git-svn: SVN 1.1.x library compatibility
38088 git-svn: several graft-branches improvements
38089 git-svn: add the commit-diff command
38090 git-svn: add --follow-parent and --no-metadata options to fetch
38091 git-svn: be verbose by default on fetch/commit, add -q/--quiet option
38092 rebase: get rid of outdated MRESOLVEMSG
38093 rebase: check for errors from git-commit
38096 git-commit: allow -e option anywhere on command line
38097 quote.c: silence compiler warnings from EMIT macro
38099 Johannes Schindelin (5):
38100 patch-id: take "commit" prefix as well as "diff-tree" prefix
38101 Teach diff about -b and -w flags
38102 cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
38103 apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
38104 Save errno in handle_alias()
38106 Junio C Hamano (12):
38107 Makefile: do not recompile main programs when libraries have changed.
38108 usage: minimum type fix.
38109 git-pull: abort when fmt-merge-msg fails.
38111 diff --color: use reset sequence when we mean reset.
38112 repo-config: fix printing of bool
38113 diff --color: use $GIT_DIR/config
38114 combine-diff.c: type sanity
38115 connect.c: remove unused parameters from tcp_connect and proxy_connect
38116 connect.c: check the commit buffer boundary while parsing.
38117 t/README: start testing porcelainish
38118 checkout -m: fix read-tree invocation
38120 Linus Torvalds (1):
38123 Martin Langhoff (3):
38124 git-repack -- respect -q and be quiet
38125 cvsimport: setup indexes correctly for ancestors and incremental imports
38126 cvsimport - cleanup of the multi-indexes handling
38128 Matthias Kestenholz (1):
38129 add GIT-CFLAGS to .gitignore
38131 Matthias Lederhofer (1):
38132 correct documentation for git grep
38135 Rename safe_strncpy() to strlcpy().
38138 Customizable error handlers
38141 git-merge: Don't use -p when outputting summary
38143 Make some strings const
38146 git-commit: filter out log message lines only when editor was run.
38149 Version v1.4.1-rc1; changes since v1.4.0:
38150 -----------------------------------------
38153 object-refs: avoid division by zero
38155 David Woodhouse (1):
38156 Log peer address when git-daemon called from inetd
38158 Dennis Stosberg (3):
38159 Make t4101-apply-nonl bring along its patches
38160 Make t8001-annotate and t8002-blame more portable
38161 Fix t8001-annotate and t8002-blame for ActiveState Perl
38163 Eric W. Biederman (3):
38164 Don't parse any headers in the real body of an email message.
38165 Fix git-format-patch -s
38166 Check and document the options to prevent mistakes.
38169 git-svn: t0000: add -f flag to checkout
38170 git-svn: fix handling of filenames with embedded '@'
38171 git-svn: eol_cp corner-case fixes
38172 git-svn: restore original LC_ALL setting (or unset) for commit
38173 git-svn: don't allow commit if svn tree is not current
38174 git-svn: support -C<num> passing to git-diff-tree
38175 git-svn: --branch-all-refs / -B support
38176 git-svn: optimize --branch and --branch-all-ref
38177 git-svn: support manually placed initial trees from fetch
38178 git-svn: Move all git-svn-related paths into $GIT_DIR/svn
38179 git-svn: minor cleanups, extra error-checking
38180 git-svn: add --repack and --repack-flags= options
38181 git-svn: add --shared and --template= options to pass to init-db
38182 git-svn: add some functionality to better support branches in svn
38183 git-svn: add UTF-8 message test
38184 git-svn: add 'log' command, a facsimile of basic `svn log'
38185 git-svn: add support for Perl SVN::* libraries
38186 git-svn: make the $GIT_DIR/svn/*/revs directory obsolete
38187 git-svn: avoid creating some small files
38188 git-svn: fix several small bugs, enable branch optimization
38189 git-svn: Eliminate temp file usage in libsvn_get_file()
38190 git-svn: bugfix and optimize the 'log' command
38191 git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
38192 git-svn: svn (command-line) 1.0.x compatibility
38193 git-svn: rebuild convenience and bugfixes
38194 git-svn: fix --rmdir when using SVN:: libraries
38195 rebase: Allow merge strategies to be used when rebasing
38196 rebase: error out for NO_PYTHON if they use recursive merge
38197 git-svn: fix commit --edit flag when using SVN:: libraries
38199 Florian Forster (9):
38200 gitweb: Adding a `blame' interface.
38201 gitweb: Make the `blame' interface in gitweb optional.
38202 Remove ranges from switch statements.
38203 Initialize FAMs using `FLEX_ARRAY'.
38204 Don't instantiate structures with FAMs.
38205 Cast pointers to `void *' when used in a format.
38206 Don't use empty structure initializers.
38207 Change types used in bitfields to be `int's.
38208 Remove all void-pointer arithmetic.
38210 Fredrik Kuivinen (1):
38211 blame: Add --time to produce raw timestamps
38213 Jakub Narębski (15):
38214 Update gitweb README: gitweb is now included with git
38215 Move gitweb style to gitweb.css
38216 gitweb: safely output binary files for 'blob_plain' action
38217 gitweb: text files for 'blob_plain' action without charset by default
38218 Fix gitweb stylesheet
38219 Make CSS file gitweb/gitweb.css more readable
38220 gitweb: add type="text/css" to stylesheet link
38221 Fix: Support for the standard mime.types map in gitweb
38222 gitweb: A couple of page title tweaking
38223 gitweb: style done with stylesheet
38224 gitweb: whitespace cleanup
38225 Add git version to gitweb output
38226 Move $gitbin earlier in gitweb.cgi
38227 gitweb: Make use of $PATH_INFO for project parameter
38228 gitweb: whitespace cleanup around '='
38230 Johannes Schindelin (6):
38231 diff options: add --color
38232 Initialize lock_file struct to all zero.
38233 Fix setting config variables with an alternative GIT_CONFIG
38234 Read configuration also from $HOME/.gitconfig
38235 repo-config: Fix late-night bug
38236 git_config: access() returns 0 on success, not > 0
38238 Junio C Hamano (31):
38239 Revert all the rev-list option parsing changes.
38240 Clean-up Geert's similarity fingerprint code.
38241 Extract "log [diff options]" parser out.
38242 whatchanged options parser fix.
38243 Built-in git-whatchanged
38245 Try using Geert similarity code in pack-objects.
38246 Retire rabinpoly fingerprinting code
38247 Fix mismerged update-index from jc/cache-tree branch.
38248 read-tree: --prefix=<path>/ option.
38249 write-tree: --prefix=<path>
38250 read-tree: reorganize bind_merge code.
38251 fetch-pack: give up after getting too many "ack continue"
38252 Fix earlier mismerges.
38253 shared repository: optionally allow reading to "others".
38254 gitk: rereadrefs needs listrefs
38256 t5100: mailinfo and mailsplit tests.
38257 mailinfo: ignore blanks after in-body headers.
38258 fix rfc2047 formatter.
38259 xdiff: minor changes to match libxdiff-0.21
38260 Restore SIGCHLD to SIG_DFL where we care about waitpid().
38261 checkout -f: do not leave untracked working tree files.
38262 upload-pack: avoid sending an incomplete pack upon failure
38263 upload-pack: prepare for sideband message support.
38264 Retire git-clone-pack
38265 upload-pack/fetch-pack: support side-band communication
38266 Add renaming-rebase test.
38267 daemon: send stderr to /dev/null instead of closing.
38268 rebase --merge: fix for rebasing more than 7 commits.
38269 Makefile: do not force unneeded recompilation upon GIT_VERSION changes
38271 Linus Torvalds (9):
38272 Tentative built-in "git show"
38273 gitweb.cgi history not shown
38274 Shrink "struct object" a bit
38275 Move "void *util" from "struct object" into "struct commit"
38276 Some more memory leak avoidance
38277 Remove "refs" field from "struct object"
38278 Add specialized object allocator
38279 Add "named object array" concept
38280 Fix grow_refs_hash()
38282 Lukas Sandström (6):
38283 Make git-write-tree a builtin
38284 Make git-mailsplit a builtin
38285 Make git-mailinfo a builtin
38286 Make git-stripspace a builtin
38287 Make git-update-index a builtin
38288 Make git-update-ref a builtin
38290 Martin Langhoff (3):
38291 cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
38292 cvsimport: complete the cvsps run before starting the import
38293 cvsimport: keep one index per branch during import
38296 date.c: improve guess between timezone offset and year.
38298 Paul Mackerras (1):
38299 Fix PPC SHA1 routine for large input buffers
38302 Implement safe_strncpy() as strlcpy() and use it more.
38305 Support for extracting configuration from different files
38306 Support for the standard mime.types map in gitweb
38309 git-tar-tree: Simplify write_trailer()
38310 git-tar-tree: documentation update
38311 git-tar-tree: no more void pointer arithmetic
38312 Make release tarballs friendlier to older tar versions
38314 Sean Estabrooks (1):
38315 Add a "--notags" option for git-p4import.
38317 Sven Verdoolaege (1):
38318 git-cvsexportcommit.perl: fix typo
38321 gitweb: Use $hash_base as $search_hash if possible
38323 Uwe Kleine-König (1):
38324 Fix possible out-of-bounds array access
38327 auto-detect changed prefix and/or changed build flags
38328 Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
38331 Version v1.4.0; changes since v1.4.0-rc2:
38332 -----------------------------------------
38334 Horst H. von Brand (1):
38335 Fix formatting of Documentation/git-clone.txt
38337 Junio C Hamano (7):
38338 allow working in repositories with textual symref HEAD
38339 git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
38340 git-rm: honor -n flag.
38341 builtin-init-db: spell the in-program configuration variable in lowercase.
38342 shared repository - add a few missing calls to adjust_shared_perm().
38343 git-clone: fix --bare over dumb-http
38347 first working version
38424 Make the tag view look like commit header.
38425 allow sorting of index page by project path, owner and age
38426 make index page sorting more visible and increase RSS item count
38427 fix search parsing, later git does not print a trailing space
38428 don't chop_str if adding ... is longer than the original
38429 Show tooltips (like this one :)) containing full titles for truncated commit titles in the summary and shortlog views.
38432 common input validation to allow passing of textual hash id's
38434 translate reference into hash while reading a commit
38435 fix typo in link parameter of git_commit
38437 switch to git-rev-list for commit reading
38439 start searching at the current $hash value
38441 rename "branches" to "heads"
38443 provide filename for "save as" in plaintext views
38444 add Expires: +1d header to commit and commitdiff pages
38447 update the test files to have a diff
38448 escape '+' and ' ' in url's
38449 make ' ' and '+' in filenames some kind of working
38451 escape ' ' with '+' in url's
38452 replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
38454 add missing esc() rename
38460 add broken latin encoding to test file
38461 set logo output to raw mode
38463 allow utf8 characters in url parameter escape
38466 fix quoted filename lookup
38468 fix "rename" output
38474 attach tag to the link
38477 fix leading whitespace in commit text
38479 define default colors
38481 resolve textual hashes when looking up "refs"
38483 fix: Use of uninitialized value
38485 handle utf8 characters from /etc/passwd
38487 remove Christian's email address
38492 check for error return from fork()
38495 Built-in git-get-tar-commit-id
38498 prepend '--' to filelist when calling git-diff-tree
38500 Uwe Kleine-König (1):
38501 Document git-clone --use-separate-remote
38504 Add <author> and <guid> to RSS feed
38507 Version v1.4.0-rc2; changes since v1.4.0-rc1:
38508 ---------------------------------------------
38511 Some doc typo fixes
38512 config.txt grammar, typo, and asciidoc fixes
38513 git-cvsserver asciidoc formatting tweaks
38515 Horst H. von Brand (1):
38516 Cleanup git-send-email.perl:extract_valid_email
38518 Johannes Schindelin (1):
38519 If you have a config containing something like this:
38522 Refactor git_tcp_connect() functions a little.
38525 Misc doc improvements
38526 Document git-ls-tree --fullname
38528 Junio C Hamano (12):
38529 git alias: try alias last.
38530 send-email: be more lenient and just catch obvious mistakes.
38531 send-email: a bit more careful domain regexp.
38532 git-format-patch: add --output-directory long option again
38534 Make index file locking code reusable to others.
38535 refs.c: convert it to use lockfile interface.
38536 ref-log: style fixes.
38537 Documentation: add missing docs make check-docs found.
38538 make clean: remove dist-doc targets.
38539 Documentation: git-ls-tree (typofix)
38540 Documentation: add another example to git-ls-files
38542 Nick Hengeveld (2):
38544 http-fetch: fix possible segfault
38546 Paul Mackerras (12):
38547 gitk: Make a row of controls for controlling highlighting
38548 gitk: Highlight entries in the file list as well
38549 gitk: Highlight paths of interest in tree view as well
38550 gitk: First cut at a search function in the patch/file display window
38551 gitk: Improve the text window search function
38552 gitk: Move "pickaxe" find function to highlight facility
38553 gitk: Fix bug in highlight stuff when no line is selected
38554 gitk: Provide ability to highlight based on relationship to selected commit
38555 gitk: Add a goto next/previous highlighted commit function
38556 gitk: Show nearby tags
38557 gitk: Show branch name(s) as well, if "show nearby tags" is enabled
38558 gitk: Re-read the descendent/ancestor tag & head info on update
38561 Document git aliases support
38562 Documentation: git aliases
38565 Off-by-one error in get_path_prefix(), found by Valgrind
38567 Robert Fitzsimons (1):
38568 builtin-grep: pass ignore case option to external grep
38571 Version v1.4.0-rc1; changes since v1.3.3:
38572 -----------------------------------------
38575 make update-index --chmod work with multiple files and --stdin
38576 remove superflous "const"
38578 Aneesh Kumar K.V (3):
38579 gitview: Add key binding for F5.
38580 gitview: Move the console error messages to message dialog
38581 gitview: Add some useful keybindings.
38583 Björn Engelmann (2):
38584 remove the artificial restriction tagsize < 8kb
38585 add more informative error messages to git-mktag
38587 Catalin Marinas (1):
38588 Add a test-case for git-apply trying to add an ending line
38590 Christian Couder (1):
38591 Builtin git-rev-parse.
38593 Dennis Stosberg (3):
38594 git-write-tree writes garbage on sparc64
38595 git-clean fails on files beginning with a dash
38596 Update documentation for git-format-patch
38598 Dmitry V. Levin (2):
38599 execv_git_cmd: Fix stack buffer overflow.
38600 git_exec_path, execv_git_cmd: ignore empty environment variables
38603 git-cvsimport: Handle "Removed" from pserver
38605 Eric W. Biederman (8):
38606 Implement git-quiltimport
38607 Implement a --dry-run option to git-quiltimport
38608 Make read_one_header_line return a flag not a length.
38609 Move B and Q decoding into check header.
38610 Refactor commit messge handling.
38611 In handle_body only read a line if we don't already have one.
38612 More accurately detect header lines in read_one_header_line
38613 Allow in body headers beyond the in body header prefix.
38616 git-svn: documentation updates
38618 send-email: address expansion for common mailers
38619 Install git-send-email by default
38620 send-email: allow sendmail binary to be used instead of SMTP
38621 send-email: quiet some warnings, reject invalid addresses
38622 commit: allow --pretty= args to be abbreviated
38623 git-svn: starting a 1.1.0-pre development version
38624 git-svn: ignore expansion of svn:keywords
38625 t3300-funny-names: shell portability fixes
38626 tests: Remove heredoc usage inside quotes
38627 t5500-fetch-pack: remove local (bashism) usage.
38628 t6000lib: workaround a possible dash bug
38629 git-svn: t0001: workaround a heredoc bug in old versions of dash
38630 git-svn: remove assertion that broke with older versions of svn
38632 Florian Forster (1):
38633 git-svnimport: Improved detection of merges.
38635 Fredrik Kuivinen (2):
38636 blame: Fix path pruning
38637 Update the documentation for git-merge-base
38639 Horst H. von Brand (4):
38640 Fix some documentation typoes
38641 Documentation: Spelling fixes
38642 Add example xinetd(8) configuration to Documentation/everyday.txt
38643 Fix Documentation/everyday.txt: Junio's workflow
38645 J. Bruce Fields (7):
38646 tutorial: replace "whatchanged" by "log"
38647 tutorial: expanded discussion of commit history
38648 tutorial: add discussion of index file, object database
38649 documentation: mention gitk font adjustment in tutorial
38650 documentation: add brief mention of cat-file to tutorial part I
38651 Documentation: retitle the git-core tutorial
38652 Documentation: fix a tutorial-2 typo
38655 cvsimport: use git-update-index --index-info
38656 cvsimport: cleanup commit function
38657 cvsimport: set up commit environment in perl instead of using env
38658 cat-file: document -p option
38659 cvsimport: avoid "use" with :tag
38660 handle concurrent pruning of packed objects
38661 sha1_file: avoid re-preparing duplicate packs
38664 Don't write directly to a make target ($@).
38666 Johannes Schindelin (25):
38667 builtin-push: resurrect parsing of Push: lines
38668 cache-tree: replace a sscanf() by two strtol() calls
38669 builtin-push: also ask config for remote information
38670 fetch, pull: ask config for remote information
38671 repo-config: fix segfault with no argument.
38672 repo-config: trim white-space before comment
38673 repo-config: support --get-regexp
38674 repo-config: deconvolute logics
38675 fetch, pull: ask config for remote information
38676 Add a conversion tool to migrate remote information into the config
38677 builtin-push: --all and --tags _are_ explicit refspecs
38678 Teach fmt-patch to write individual files.
38679 fmt-patch: output file names to stdout
38680 fmt-patch: implement -o <dir>
38681 Teach fmt-patch about --numbered
38682 Teach fmt-patch about --keep-subject
38683 fmt-patch: understand old <his> notation
38684 Fix users of prefix_path() to free() only when necessary
38685 Fix users of prefix_path() to free() only when necessary
38686 Fix crash when reading the empty tree
38687 diff family: add --check option
38688 fmt-patch: Support --attach
38689 git-format-patch --start-number <n>
38690 send-email: only 'require' instead of 'use' Net::SMTP
38691 format-patch: resurrect extra headers from config
38693 Josef Weidendorfer (1):
38694 gitk: Add a visual tag for remote refs
38696 Junio C Hamano (156):
38697 Fix up default abbrev in setup_revisions() argument parser.
38698 Fix up rev-list option parsing.
38699 Split init_revisions() out of setup_revisions()
38700 rev-list option parser fix.
38701 Built-in git-whatchanged.
38702 Do not fork PAGER=cat
38703 Simplify common default options setup for built-in log family.
38704 log/whatchanged/show - log formatting cleanup.
38705 rev-list --header: output format fix
38706 git.c: LOGSIZE is unused after log printing cleanup.
38707 combine-diff: show diffstat with the first parent.
38708 Fix "git log --stat": make sure to set recursive with --stat.
38709 Tentative built-in format-patch.
38710 sha1_name.c: prepare to make get_tree_entry() reusable from others.
38711 sha1_name.c: no need to include diff.h; tree-walk.h will do.
38712 get_tree_entry(): make it available from tree-walk
38713 Minor tweak on subject line in --pretty=email
38714 diff: move diff.c to diff-lib.c to make room.
38715 Add git-unresolve <paths>...
38716 diff --stat: do not drop rename information.
38717 git-update-index --unresolve
38718 rename internal format-patch wip
38719 Makefile: dependency for builtin-help.o
38720 Add colordiff for git to contrib/colordiff.
38721 Fix "git show --stat"
38724 git-fmt-patch: thinkofix to show [PATCH] properly.
38725 Libified diff-index: backward compatibility fix.
38726 read-cache/write-cache: optionally return cache checksum SHA1.
38728 Update write-tree to use cache-tree.
38729 Invalidate cache-tree entries for touched paths in git-apply.
38730 Use cache-tree in update-index.
38731 Add test-dump-cache-tree
38732 cache-tree: protect against "git prune".
38733 index: make the index file format extensible.
38734 Teach fsck-objects about cache-tree.
38735 cache-tree: sort the subtree entries.
38736 test-dump-cache-tree: report number of subtrees.
38737 Makefile: remove and create libgit.a from scratch.
38738 diff --stat: show complete rewrites consistently.
38739 git-cvsserver: typofixes
38740 t0000-basic: Add ls-tree recursive test back.
38741 Makefile: remove and create xdiff library from scratch.
38742 commit-tree: allow generic object name for the tree as well.
38743 revision parsing: make "rev -- paths" checks stronger.
38744 t0000-basic: more commit-tree tests.
38745 update-index: when --unresolve, smudge the relevant cache-tree entries.
38746 read-tree: teach 1 and 2 way merges about cache-tree.
38747 read-tree: teach 1-way merege and plain read to prime cache-tree.
38748 diff-index: fix compilation warnings.
38749 cache_tree_update: give an option to update cache-tree only.
38750 test-dump-cache-tree: validate the cached data as well.
38751 pack-objects: update size heuristucs.
38752 built-in count-objects.
38753 cache-tree.c: typefix
38755 built-in diff: assorted updates.
38756 builtin-diff.c: die() formatting type fix.
38757 Fix builtin-push to honor Push: lines in remotes file.
38758 Extended SHA1 -- "rev^@" syntax to mean "all parents"
38759 get_sha1(): :path and :[0-3]:path to extract from index.
38760 built-in "git grep"
38761 Use RFC2822 dates from "git fmt-patch".
38762 builtin-grep: wildcard pathspec fixes
38763 builtin-grep: support '-l' option.
38764 builtin-grep: do not use setup_revisions()
38765 fsck-objects: mark objects reachable from cache-tree
38766 builtin-count-objects: make it official.
38767 builtin-diff: call it "git-diff", really.
38768 builtin-log/whatchanged/show: make them official.
38769 show-branch: omit uninteresting merges.
38770 builtin-push: make it official.
38771 builtin-grep: printf %.*s length is int, not ptrdiff_t.
38772 Revert "fetch, pull: ask config for remote information"
38773 builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
38774 builtin-grep: allow more than one patterns.
38775 builtin-grep: support -c (--count).
38776 builtin-grep: support -w (--word-regexp).
38777 builtin-grep: tighten path wildcard vs tree traversal.
38778 core.prefersymlinkrefs: use symlinks for .git/HEAD
38779 repo-config: readability fixups.
38780 builtin-count-objects: open packs when running -v
38781 Fix test-dump-cache-tree in one-tree disappeared case.
38782 read-tree: invalidate cache-tree entry when a new index entry is added.
38783 cache-tree: a bit more debugging support.
38784 builtin-grep: terminate correctly at EOF
38785 builtin-grep: binary files -a and -I
38786 fsck-objects: do not segfault on missing tree in cache-tree
38787 builtin-grep: -L (--files-without-match).
38788 Makefile: do not link rev-list any specially.
38789 delta: stricter constness
38790 pack-object: squelch eye-candy on non-tty
38792 binary diff: further updates.
38793 update-index --unresolve: work from a subdirectory.
38794 checkout-index: plug memory leak from prefix_path()
38795 update-index: plug memory leak from prefix_path()
38796 update-index --again
38797 update-index --again: take optional pathspecs
38798 binary diff and apply: testsuite.
38799 Teach -f <file> option to builtin-grep.
38800 builtin-grep: documentation
38801 get_sha1() - fix infinite loop on nonexistent stage.
38802 Teach git-clean optional <paths>... parameters.
38803 builtin-grep: tighten argument parsing.
38804 builtin-grep: typofix
38805 builtin-grep: -w fix
38806 builtin-grep: -F (--fixed-strings)
38807 checkout: use --aggressive when running a 3-way merge (-m).
38808 diffstat rename squashing fix.
38809 read-tree -u one-way merge fix to check out locally modified paths.
38810 apply --numstat: show new name, not old name.
38811 builtin-grep: unparse more command line options.
38812 apply --cached: apply a patch without using working tree.
38813 git-am: use apply --cached
38814 builtin-diff: fix comparison between two blobs.
38815 merge-base: Clarify the comments on post processing.
38816 read-tree -m -u: do not overwrite or remove untracked working tree files.
38817 builtin-grep: workaround for non GNU grep.
38818 Revert "builtin-grep: workaround for non GNU grep."
38819 apply --cached: do not check newly added file in the working tree
38820 builtin-add: fix unmatched pathspec warnings.
38821 builtin-diff: do not say files are renamed when blob and file are given
38822 Fix build procedure for builtin-init-db
38823 built-in tar-tree and remote tar-tree
38824 git-format-patch: now built-in.
38825 checkdiff_consume: strtol parameter fix.
38826 git-rebase: use canonical A..B syntax to format-patch
38827 tutorial-2: typofix in examples.
38828 mailinfo: skip bogus UNIX From line inside body
38829 CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
38830 builtin format-patch: squelch content-type for 7-bit ASCII
38831 diff: minor option combination fix.
38832 fetch-pack: output refs in the order they were given on the command line.
38833 Tutorial #2: broken link fix.
38834 builtin-rm: squelch compiler warnings.
38835 cvsimport: do not barf on creation of an empty file.
38836 apply: force matching at the beginning.
38837 fetch.c: remove an unused variable and dead code.
38838 ls-remote: fix rsync:// to report HEAD
38839 mailinfo: More carefully parse header lines in read_one_header_line()
38840 gitk: start-up bugfix
38841 built-in format-patch: various fixups.
38842 format-patch: -n and -k are mutually exclusive.
38843 Let git-clone to pass --template=dir option to git-init-db.
38844 git-fetch: avoid using "case ... in (arm)"
38845 adjust to the rebased series by Linus.
38846 send-email: do not pass bogus address to local sendmail binary
38847 format-patch --signoff
38848 fetch.c: do not pass uninitialized lock to unlock_ref().
38849 fetch.c: do not call process_tree() from process_tree().
38850 fetch: do not report "same" unless -verbose.
38851 read-tree --reset: update working tree file for conflicted paths.
38852 rev-parse: tighten constness properly.
38854 Linus Torvalds (60):
38855 Common option parsing for "git log --diff" and friends
38856 Tentative built-in "git show"
38857 Fixes for option parsing
38858 Log message printout cleanups
38859 Log message printout cleanups (#2)
38860 Log message printout cleanups (#3): fix --pretty=oneline
38861 Fix uninteresting tags in new revision parsing
38862 get_sha1() shorthands for blob/tree objects
38863 Allow "git repack" users to specify repacking window/depth
38864 git log: don't do merge diffs by default
38865 Split up builtin commands into separate files from git.c
38866 Fix "git help -a" terminal autosizing
38868 Fix "git-log --parents" breakage post v1.3.0
38869 sha1_to_hex() usage cleanup
38870 git diff: support "-U" and "--unified" options properly
38871 Allow one-way tree merge to remove old files
38872 Simplify "git reset --hard"
38873 builtin-grep: use external grep when we can take advantage of it
38874 read-tree --reset -u fix.
38875 Fix silly typo in new builtin grep
38876 Remove old "git-grep.sh" remnants
38877 libify git-ls-files directory traversal
38878 Clean up git-ls-file directory walking library interface
38879 Do "git add" as a builtin
38880 builtin-add: warn on unmatched pathspecs
38881 builtin-grep: workaround for non GNU grep.
38882 Remove old "git-add.sh" remnants
38883 Prevent bogus paths from being added to the index.
38884 Make "git rev-list" be a builtin
38885 Libify the index refresh logic
38886 Move pathspec matching from builtin-add.c into dir.c
38887 Add builtin "git rm" command
38888 cvsimport: repack every kilo-commits.
38889 apply: treat EOF as proper context.
38890 Clean up sha1 file writing
38891 bogus "fatal: Not a git repository"
38892 t1002: use -U0 instead of --unified=0
38893 Fix "--abbrev=xyz" for revision listing
38894 Fix memory leak in "git rev-list --objects"
38895 Don't use "sscanf()" for tree mode scanning
38896 Add raw tree buffer info to "struct tree"
38897 Make "tree_entry" have a SHA1 instead of a union of object pointers
38898 Switch "read_tree_recursive()" over to tree-walk functionality
38899 Remove "tree->entries" tree-entry list from tree parser
38900 Make "struct tree" contain the pointer to the tree buffer
38901 Make "tree_entry" have a SHA1 instead of a union of object pointers
38902 Switch "read_tree_recursive()" over to tree-walk functionality
38903 builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
38904 Remove "tree->entries" tree-entry list from tree parser
38905 fsck-objects: avoid unnecessary tree_entry_list usage
38906 Remove unused "zeropad" entry from tree_list_entry
38907 Convert "mark_tree_uninteresting()" to raw tree walker
38908 Convert fetch.c: process_tree() to raw tree walker
38909 Remove last vestiges of generic tree_entry_list
38910 tree_entry(): new tree-walking helper function
38911 read-tree: fix eye-candy.
38912 Fix typo in tutorial-2.txt
38913 rev-list: fix process_tree() conversion.
38914 pack-objects: improve path grouping heuristics.
38916 Lukas Sandström (2):
38917 Make git-check-format-ref a builtin.
38918 SubmittingPatches: The download location of External Editor has moved
38920 Martin Langhoff (7):
38921 git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
38922 cvsserver: use git-rev-list instead of git-log
38923 cvsserver: use git-rev-list instead of git-log
38924 cvsimport: minor fixups
38925 cvsimport: replace anonymous sub ref with a normal sub
38926 cvsimport: introduce -L<imit> option to workaround memory leaks
38927 cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
38930 Transitively read alternatives
38931 test case for transitive info/alternates
38932 clone: don't clone the info/alternates file
38933 git help: remove whatchanged from list of common commands
38934 Documentation/Makefile: remove extra /
38935 Add instructions to commit template.
38938 Added logged warnings for CVS error returns
38939 Many fixes for most operations in Eclipse.
38940 Change to allow subdir updates from Eclipse
38942 Matthias Kestenholz (1):
38943 add documentation for update-index --unresolve
38945 Matthias Lederhofer (1):
38946 git status: skip empty directories, and add -u to show all untracked files
38948 Nick Hengeveld (3):
38949 git-fetch: resolve remote symrefs for HTTP transport
38950 http: prevent segfault during curl handle reuse
38951 builtin-push: don't pass --thin to HTTP transport
38953 Nicolas Pitre (10):
38954 split the diff-delta interface
38955 use delta index data when finding best delta matches
38956 replace adler32 with Rabin's polynomial in diff-delta
38957 tiny optimization to diff-delta
38958 improve diff-delta with sparse and/or repetitive data
38959 improve base85 generated assembly code
38960 fix diff-delta bad memory access
38961 simple euristic for further free packing improvements
38962 pack-object: slightly more efficient
38963 improve depth heuristic for maximum delta size
38965 Paul Mackerras (19):
38966 gitk: Implement multiple views
38967 gitk: Make File->Update work properly again
38968 gitk: Fix various bugs in the view support
38969 gitk: Don't reread git-rev-list output from scratch on view switch
38970 gitk: Remember the view in the history list
38971 gitk: Let git-rev-list do the argument list parsing
38972 gitk: Use git-rev-parse only to identify file/dir names on cmd line
38973 gitk: Implement "permanent" views (stored in ~/.gitk)
38974 gitk: add menu item for editing the current view
38975 gitk: Use a text widget for the file list
38976 gitk: Add a tree-browsing mode
38977 gitk: Basic support for highlighting one view within another
38978 gitk: Fix file list display when files are renamed
38979 gitk: Allow view to specify arbitrary arguments to git-rev-list
38980 gitk: Fix display of "(...)" for parents/children we haven't drawn
38981 Provide a way to flush git-diff-tree's output
38982 gitk: Fix bug where page-up/down wouldn't always work properly
38983 gitk: show_error fix
38984 Make git-diff-tree indicate when it flushes
38987 Add git-quiltimport to .gitignore.
38988 Builtin git-ls-files.
38989 Builtin git-ls-tree.
38990 Builtin git-tar-tree.
38991 Builtin git-read-tree.
38992 Builtin git-commit-tree.
38994 Builtin git-show-branch.
38995 Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
38997 Peter Hagervall (1):
38998 Sparse fix for builtin-diff
39001 git-repo-config --list support
39002 Deprecate usage of git-var -l for getting config vars list
39003 Call builtin ls-tree in git-cat-file -p
39006 git-send-email: Add References: headers to emails, in addition to In-Reply-To:
39007 Add support for --bcc to git-send-email.
39008 Fix a bug in email extraction used in git-send-email.
39009 Add a basic test case for git send-email, and fix some real bugs discovered.
39011 Salikh Zakirov (1):
39012 Fixed Cygwin CR-munging problem in mailsplit
39015 Document that "git add" only adds non-ignored files.
39017 Sean Estabrooks (19):
39018 Add --continue and --abort options to git-rebase.
39019 Several trivial documentation touch ups.
39020 Fix up docs where "--" isn't displayed correctly.
39021 Update git-unpack-objects documentation.
39022 Clarify git-cherry documentation.
39023 Another config file parsing fix.
39024 t1300-repo-config: two new config parsing tests.
39025 Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
39026 Make git rebase interactive help match documentation.
39027 Add "--summary" option to git diff.
39028 Convert some "apply --summary" users to "diff --summary".
39029 Strip useless "tags/" prefix from git-tag -l output
39030 Allow pickaxe and diff-filter options to be used by git log.
39031 Avoid segfault in diff --stat rename output.
39032 Change GIT-VERSION-GEN to call git commands with "git" not "git-".
39033 Install git builtins into gitexecdir rather than bindir.
39034 Remove possible segfault in http-fetch.
39035 --summary output should print immediately after stats.
39036 A Perforce importer for git.
39038 Serge E. Hallyn (1):
39039 socksetup: don't return on set_reuse_addr() error
39042 gitk: Display commit messages with word wrap
39044 Shawn O. Pearce (24):
39045 Remove unnecessary local in get_ref_sha1.
39046 Improve abstraction of ref lock/write.
39047 Convert update-ref to use ref_lock API.
39048 Log ref updates to logs/refs/<ref>
39049 Support 'master@2 hours ago' syntax
39050 Fix ref log parsing so it works properly.
39051 General ref log reading improvements.
39052 Added logs/ directory to repository layout.
39053 Force writing ref if it doesn't exist.
39054 Log ref updates made by fetch.
39055 Change 'master@noon' syntax to 'master@{noon}'.
39056 Correct force_write bug in refs.c
39057 Change order of -m option to update-ref.
39058 Include ref log detail in commit, reset, etc.
39059 Create/delete branch ref logs.
39060 Enable ref log creation in git checkout -b.
39061 Reference git-check-ref-format in git-branch.
39062 Elaborate on why ':' is a bad idea in a ref name.
39063 Built git-upload-tar should be ignored.
39064 Verify git-commit provides a reflog message.
39065 Test that git-branch -l works.
39066 Remove unnecessary output from t3600-rm.
39067 Improved pack format documentation.
39068 Allow multiple -m options to git-commit.
39070 Tilman Sauerbeck (1):
39071 Documentation/Makefile: create tarballs for the man pages and html files
39074 Builtin git-init-db
39075 Builtin git-cat-file
39076 gitk: Replace "git-" commands with "git "
39079 NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
39080 Problem: 'trap...exit' causes error message when /bin/sh is ash.
39083 Do not call 'cmp' with non-existant -q flag.
39084 Document current cvsexportcommit limitations.
39085 Make cvsexportcommit create parent directories as needed.
39088 Version v1.3.3; changes since v1.3.2:
39089 -------------------------------------
39092 include header to define uint32_t, necessary on Mac OS X
39094 Dennis Stosberg (2):
39095 Fix git-pack-objects for 64-bit platforms
39096 Fix compilation on newer NetBSD systems
39098 Dmitry V. Levin (1):
39099 Separate object name errors from usage errors
39102 apply: fix infinite loop with multiple patches with --index
39103 Install git-send-email by default
39105 Johannes Schindelin (1):
39106 repo-config: trim white-space before comment
39108 Junio C Hamano (6):
39109 core.prefersymlinkrefs: use symlinks for .git/HEAD
39110 repo-config: document what value_regexp does a bit more clearly.
39111 Fix repo-config set-multivar error return path.
39112 Documentation: {caret} fixes (git-rev-list.txt)
39113 checkout: use --aggressive when running a 3-way merge (-m).
39114 Fix pack-index issue on 64-bit platforms a bit more portably.
39116 Linus Torvalds (3):
39117 Fix "git diff --stat" with long filenames
39118 revert/cherry-pick: use aggressive merge.
39119 git config syntax updates
39122 clone: keep --reference even with -l -s
39123 repack: honor -d even when no new pack was created
39125 Matthias Lederhofer (1):
39126 core-tutorial.txt: escape asterisk
39129 Release config lock if the regex is invalid
39131 Sean Estabrooks (3):
39132 Fix for config file section parsing.
39133 Another config file parsing fix.
39134 Ensure author & committer before asking for commit message.
39137 read-cache.c: use xcalloc() not calloc()
39140 Version v1.3.2; changes since v1.3.1:
39141 -------------------------------------
39144 git-format-patch: Use rfc2822 compliant date.
39147 Alphabetize the glossary.
39148 Added definitions for a few words:
39149 Add a few more words to the glossary.
39151 Junio C Hamano (4):
39153 commit-tree.c: check_valid() microoptimization.
39154 verify-pack: check integrity in a saner order.
39155 git-am --resolved: more usable error message.
39157 Linus Torvalds (1):
39158 Fix filename verification when in a subdirectory
39160 Martin Langhoff (1):
39161 git-send-email: fix version string to be valid perl
39163 Matthias Kestenholz (3):
39164 annotate: fix warning about uninitialized scalar
39165 annotate: display usage information if no filename was given
39166 fix various typos in documentation
39168 Robert Shearman (1):
39169 Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
39171 Sean Estabrooks (4):
39172 Update the git-branch man page to include the "-r" option,
39173 Fix up remaining man pages that use asciidoc "callouts".
39174 Properly render asciidoc "callouts" in git man pages.
39175 Fix trivial typo in git-log man page.
39178 Version v1.3.1; changes since v1.3.0:
39179 -------------------------------------
39182 Fix filename scaling for binary files
39184 Junio C Hamano (5):
39185 git-merge: a bit more readable user guidance.
39186 pre-commit hook: complain about conflict markers.
39187 git-commit --amend: two fixes.
39188 pack-objects: do not stop at object that is "too small"
39189 mailinfo: decode underscore used in "Q" encoding properly.
39191 Linus Torvalds (1):
39192 git-log produces no output
39195 fix pack-object buffer size
39197 Paul Mackerras (1):
39198 rev-parse: better error message for ambiguous arguments
39201 Document git-var -l listing also configuration variables
39202 Document the configuration file
39205 Reintroduce svn pools to solve the memory leak.
39207 Serge E. Hallyn (1):
39208 socksetup: don't return on set_reuse_addr() error
39210 Shawn O. Pearce (1):
39211 Document git-clone --reference
39214 Version v1.3.0; changes since v1.3.0-rc4:
39215 -----------------------------------------
39217 A Large Angry SCM (1):
39220 Herbert Valerio Riedel (1):
39221 git-svnimport symlink support
39223 Johannes Schindelin (2):
39224 diff-options: add --patch-with-stat
39225 pager: do not fork a pager if PAGER is set to empty.
39228 Add git-annotate(1) and git-blame(1)
39230 Junio C Hamano (9):
39231 rev-list --bisect: limit list before bisecting.
39232 diff-tree: typefix.
39233 diff --stat: do not do its own three-dashes.
39234 diff-files --stat: do not dump core with unmerged index.
39235 reading $GIT_DIR/info/graft - skip comments correctly.
39236 rev-list --boundary: show boundary commits even when limited otherwise.
39237 packed_object_info_detail(): check for corrupt packfile.
39238 diff --stat: make sure to set recursive.
39241 Linus Torvalds (1):
39242 Support "git cmd --help" syntax
39244 Paul Mackerras (1):
39245 gitk: Fix bug caused by missing commitlisted elements
39247 Serge E. Hallyn (5):
39248 cleanups: Fix potential bugs in connect.c
39249 cleanups: Remove unused vars from combine-diff.c
39250 cleanups: Remove impossible case in quote.c
39251 cleanups: prevent leak of two strduped strings in config.c
39252 cleanups: remove unused variable from exec_cmd.c
39255 Allow empty lines in info/grafts
39258 Version v1.3.0-rc4; changes since v1.3.0-rc3:
39259 ---------------------------------------------
39261 Davide Libenzi (1):
39262 xdiff: post-process hunks to make them consistent.
39264 Dennis Stosberg (2):
39265 Solaris 9 also wants our own unsetenv/setenv.
39266 Replace index() with strchr().
39268 Eric W. Biederman (1):
39269 Implement limited context matching in git-apply.
39271 Johannes Schindelin (2):
39272 diff-options: add --stat (take 2)
39273 diff-options: add --stat (take 2)
39275 Junio C Hamano (31):
39276 git-log: match rev-list --abbrev and --abbrev-commit
39277 diff: fix output of total-rewrite diff.
39278 diffcore-rename: fix merging back a broken pair.
39279 log-tree: separate major part of diff-tree.
39280 git log [diff-tree options]...
39281 Retire diffcore-pathspec.
39282 tree-diff: do not assume we use only one pathspec
39283 git log --full-diff
39285 blame and friends: adjust to multiple pathspec change.
39286 Retire git-log.sh (take#2)
39287 diff-* --patch-with-raw
39288 Retire git-log.sh (take #3)
39289 combine-diff: do not lose hunks with only deletion at end.
39290 combine-diff: fix hunks at the end (take #2).
39291 Retire t5501-old-fetch-and-upload test.
39292 git-commit: do not muck with commit message when no_edit is set.
39293 stripspace: make sure not to leave an incomplete line.
39294 combine-diff: type fix.
39295 Documentation: add a couple of missing docs.
39296 Makefile: $(MAKE) check-docs
39297 git-log: do not output excess blank line between commits
39298 t3600-rm: skip failed-remove test when we cannot make an unremovable file.
39299 Fix-up previous expr changes.
39300 diff --stat: no need to ask funcnames nor context.
39302 stripspace: incomplete line fix (take #2)
39303 Retire git-log.sh (take #4)
39304 git-log <diff-options> <paths> documentation
39305 "git cmd -h" for shell scripts.
39308 Linus Torvalds (4):
39309 Make "--parents" logs also be incremental
39310 When showing a commit message, do not lose an incomplete line.
39311 Use less memory in "git log"
39312 Clean up trailing whitespace when pretty-printing commits
39315 xdiff/xdiffi.c: fix warnings about possibly uninitialized variables
39318 Shell utilities: Guard against expr' magic tokens.
39321 Improve the git-diff-tree -c/-cc documentation
39322 Document --patch-with-raw
39323 Separate the raw diff and patch with a newline
39326 Version v1.3.0-rc3; changes since v1.3.0-rc2:
39327 ---------------------------------------------
39330 Tweaks to make asciidoc play nice.
39332 Johannes Schindelin (3):
39333 cvsimport: use git-update-ref when updating
39334 On some platforms, certain headers need to be included before regex.h
39335 Fix compile with expat, but an old curl version
39338 Added Packing Heursitics IRC writeup.
39340 Junio C Hamano (16):
39341 git-clone: fix handling of upsteram whose HEAD does not point at master.
39342 combine-diff: use built-in xdiff.
39343 parse_date(): fix parsing 03/10/2006
39344 combine-diff: refactor built-in xdiff interface.
39345 diff_flush(): leakfix.
39346 combine-diff: move the code to parse hunk-header into common library.
39347 blame: use built-in xdiff
39348 date parsing: be friendlier to our European friends.
39349 blame.c: fix completely broken ancestry traversal.
39350 Match ofs/cnt types in diff interface.
39351 blame -S <ancestry-file>
39352 Add Documentation/technical/pack-format.txt
39353 Thin pack generation: optimization.
39354 rev-list --abbrev-commit
39355 count-delta: match get_delta_hdr_size() changes.
39359 git-svnimport: Don't assume that copied files haven't changed
39362 Provide configurable UI font for gitk
39365 git-commit: document --amend
39368 gitk: Use git wrapper to run git-ls-remote.
39370 Mike McCormack (3):
39371 Avoid a divide by zero if there's no messages to send.
39372 Avoid a crash if realloc returns a different pointer.
39373 Add documentation for git-imap-send.
39375 Nick Hengeveld (1):
39376 http-fetch: add optional DAV-based pack list
39379 check patch_delta bounds more carefully
39381 Paul Mackerras (3):
39382 gitk: replace parent and children arrays with lists
39383 gitk: Add a help menu item to display key bindings
39384 gitk: Fix incorrect invocation of getmergediffline
39387 Add git-clean command
39388 gitk: Fix searching for filenames in gitk
39391 Support for pickaxe matching regular expressions
39393 Rutger Nijlunsing (1):
39394 gitk: add key bindings for selecting first and last commit
39396 Stephen Rothwell (1):
39397 gitk: allow goto heads
39400 Version v1.3.0-rc2; changes since v1.3.0-rc1:
39401 ---------------------------------------------
39403 Davide Libenzi (1):
39404 Clean-up trivially redundant diff.
39407 contrib/git-svn: force GIT_DIR to an absolute path
39408 contrib/git-svn: accept configuration via repo-config
39409 contrib/git-svn: documentation updates
39410 contrib/git-svn: ensure repo-config returns a value before using it
39411 contrib/git-svn: make sure our git-svn is up-to-date for test
39412 contrib/git-svn: handle array values correctly
39414 J. Bruce Fields (1):
39415 Documentation: revise top of git man page
39418 Add ALL_LDFLAGS to the git target.
39419 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
39422 fix repacking with lots of tags
39424 Junio C Hamano (14):
39425 rev-list --no-merges: argument parsing fix.
39426 rev-list: memory usage reduction.
39427 rev-list --boundary
39428 revision arguments: ..B means HEAD..B, just like A.. means A..HEAD
39429 revision.c "..B" syntax: constness fix
39430 assume unchanged git: diff-index fix.
39431 tree/diff header cleanup.
39432 rev-list --boundary: fix re-injecting boundary commits.
39433 Makefile: many programs now depend on xdiff/lib.a having been built.
39434 revision: --topo-order and --unpacked
39435 revision: simplify argument parsing.
39436 revision: --max-age alone does not need limit_list() anymore.
39437 safe_fgets() - even more anal fgets()
39440 Linus Torvalds (5):
39441 Move "--parent" parsing into generic revision.c library code
39442 Make path-limiting be incremental when possible.
39443 revision: Fix --topo-order and --max-age with reachability limiting.
39444 Fix Solaris stdio signal handling stupidities
39445 pack-objects: be incredibly anal about stdio semantics
39448 xdiff: Show function names in hunk headers.
39450 Nick Hengeveld (2):
39451 git-ls-remote: send no-cache header when fetching info/refs
39452 Set HTTP user agent to git/GIT_VERSION
39454 Paul Mackerras (5):
39455 gitk: Use the new --boundary flag to git-rev-list
39456 gitk: Show diffs for boundary commits
39457 gitk: Prevent parent link from overwriting commit headline
39458 gitk: Allow top panes to scroll horizontally with mouse button 2
39459 gitk: Better workaround for arrows on diagonal line segments
39462 Use blob_, commit_, tag_, and tree_type throughout.
39463 Replace xmalloc+memset(0) with xcalloc.
39466 Remove useless pointer update
39467 Fix sparse warnings about usage of 0 instead of NULL
39468 Fix sparse warnings about non-ANSI function prototypes
39471 Make git-clone to take long double-dashed origin option (--origin)
39472 git-clone: exit early if repo isn't specified
39475 Version v1.3.0-rc1; changes since v1.2.6:
39476 -----------------------------------------
39479 PATCH: simplify calls to git programs in git-fmt-merge-msg
39480 workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm)
39482 Alexandre Julliard (12):
39483 Add an Emacs interface in contrib.
39484 git-format-patch: Always add a blank line between headers and body.
39485 contrib/emacs: Add an Emacs VC backend.
39486 git.el: Portability fixes for XEmacs and Emacs CVS.
39487 git.el: Set default directory before running the status mode setup hooks.
39488 git.el: Automatically update .gitignore status.
39489 git.el: Added support for Signed-off-by.
39490 git.el: Added customize support for all parameters.
39491 ls-files: Don't require exclude files to end with a newline.
39492 git.el: More robust handling of subprocess errors when returning strings.
39493 git.el: Get the default user name and email from the repository config.
39494 git.el: Added a function to diff against the other heads in a merge.
39497 git-svnimport: if a limit is specified, respect it
39499 Aneesh Kumar K.V (16):
39500 Add contrib/gitview from Aneesh.
39501 Add a README for gitview
39503 gitview: Read tag and branch information using git ls-remote
39504 gitview: Use monospace font to draw the branch and tag name
39505 gitview: Display the lines joining commit nodes clearly.
39506 gitview: Fix DeprecationWarning
39507 gitview: Bump the rev
39508 gitview: Code cleanup
39509 gitview: Fix the graph display .
39510 gitview: Fix the encoding related bug
39511 gitview: Remove trailing white space
39512 gitview: Some window layout changes.
39513 gitview: Set the default width of graph cell
39514 gitview: Use horizontal scroll bar in the tree view
39515 gitview: pass the missing argument _show_clicked_cb.
39518 git-rebase: Clarify usage statement and copy it into the actual documentation.
39519 New test to verify that when git-clone fails it cleans up the new directory.
39520 git-ls-files: Fix, document, and add test for --error-unmatch option.
39521 Add new git-rm command with documentation
39522 git-rm: Fix to properly handle files with spaces, tabs, newlines, etc.
39524 Dmitry V. Levin (1):
39525 git/Documentation: fix SYNOPSIS style bugs
39528 Introducing contrib/git-svn.
39529 git-svn: fix revision order when XML::Simple is not loaded
39530 git-svn: ensure fetch always works chronologically.
39531 git-svn: remove files from the index before adding/updating
39532 git-svn: fix a typo in defining the --no-stop-on-copy option
39533 git-svn: allow --find-copies-harder and -l<num> to be passed on commit
39534 git-svn: Allow for more argument types for commit (from..to)
39535 git-svn: remove any need for the XML::Simple dependency
39536 git-svn: change ; to && in addremove()
39537 contrib/git-svn.txt: add a note about renamed/copied directory support
39538 git-svn: fix several corner-case and rare bugs with 'commit'
39539 contrib/git-svn: add Makefile, test, and associated ignores
39540 git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
39541 contrib/git-svn: add show-ignore command
39542 contrib/git-svn: optimize sequential commits to svn
39543 contrib/git-svn: version 0.10.0
39544 contrib/git-svn: tell the user to not modify git-svn-HEAD directly
39545 contrib/git-svn: correct commit example in manpage
39546 contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
39547 git-branch: add -r switch to list refs/remotes/*
39548 contrib/git-svn: add -b/--branch switch for branch detection
39549 contrib/git-svn: several small bug fixes and changes
39550 contrib/git-svn: strip 'git-svn-id:' when commiting to SVN
39551 contrib/git-svn: allow --authors-file to be specified
39552 contrib/git-svn: cleanup option parsing
39553 contrib/git-svn: create a more recent master if one does not exist
39554 contrib/git-svn: avoid re-reading the repository uuid, it never changes
39555 contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch
39556 contrib/git-svn: better documenting of CLI switches
39557 send-email: accept --no-signed-off-by-cc as the documentation states
39558 contrib/git-svn: fix a copied-tree bug in an overzealous assertion
39559 contrib/git-svn: fix svn compat and fetch args
39560 contrib/git-svn: remove the --no-stop-on-copy flag
39561 contrib/git-svn: fix a harmless warning on rebuild (with old repos)
39562 fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
39563 ls-tree: add --abbrev[=<n>] option
39564 ls-files: add --abbrev[=<n>] option
39565 contrib/git-svn: allow rebuild to work on non-linear remote heads
39566 send-email: use built-in time() instead of /bin/date '+%s'
39567 send-email: Change from Mail::Sendmail to Net::SMTP
39568 send-email: try to order messages in email clients more correctly
39569 send-email: lazy-load Email::Valid and make it optional
39570 contrib/git-svn: stabilize memory usage for big fetches
39572 Fernando J. Pereda (1):
39573 Allow building Git in systems without iconv
39576 AsciiDoc fix for tutorial
39577 Tweak asciidoc output to work with broken docbook-xsl
39578 Fix multi-paragraph list items in OPTIONS section
39579 Format tweaks for asciidoc.
39581 Fredrik Kuivinen (13):
39582 Add git-blame, a tool for assigning blame.
39584 git-blame: Make the output human readable
39585 git-blame: Use the same tests for git-blame as for git-annotate
39586 Fix some inconsistencies in the docs
39587 Remove trailing dot after short description
39588 Nicer output from 'git'
39589 Make it possible to not clobber object.util in sort_in_topological_order (take 2)
39590 rev-lib: Make it easy to do rename tracking (take 2)
39591 blame: Rename detection (take 2)
39592 blame: Nicer output
39593 blame: Fix git-blame <directory>
39594 Makefile: Add TAGS and tags targets
39596 J. Bruce Fields (1):
39597 Document git-rebase behavior on conflicts.
39600 Fix typo in git-rebase.sh.
39602 Jeff Muizelaar (2):
39603 cosmetics: change from 'See-Also' to 'See Also'
39604 documentation: add 'see also' sections to git-rm and git-add
39606 Johannes Schindelin (13):
39608 Optionally support old diffs
39610 Optionally work without python
39611 Fixes for ancient versions of GNU make
39612 avoid makefile override warning
39613 Really honour NO_PYTHON
39615 Use Ryan's git-annotate instead of jsannotate
39616 Warn about invalid refs
39617 Fix test case for some sed
39618 imap-send: Add missing #include for macosx
39619 Remove dependency on a file named "-lz"
39622 Add git-show reference
39623 Call out the two different uses of git-branch and fix a typo.
39624 Document the default source of template files.
39625 Clarify git-rebase example commands.
39626 Reference git-commit-tree for env vars.
39628 Rewrite synopsis to clarify the two primary uses of git-checkout.
39629 Clarify and expand some hook documentation.
39630 Removed bogus "<snap>" identifier.
39633 manpages: insert two missing [verse] markers for multi-line SYNOPSIS
39634 repo-config: give value_ a sane default so regexec won't segfault
39636 Josef Weidendorfer (1):
39637 git-mv: fix moves into a subdir from outside
39639 Junio C Hamano (137):
39640 "Assume unchanged" git
39641 "Assume unchanged" git: do not set CE_VALID with --refresh
39642 ls-files: debugging aid for CE_VALID changes.
39643 "Assume unchanged" git: --really-refresh fix.
39644 ls-files: split "show-valid-bit" into a different option.
39645 "assume unchanged" git: documentation.
39646 cache_name_compare() compares name and stage, nothing else.
39647 git-commit: Now --only semantics is the default.
39648 rebase: allow a hook to refuse rebasing.
39649 commit: detect misspelled pathspec while making a partial commit.
39650 rebase: allow rebasing onto different base.
39651 ls-files --error-unmatch pathspec error reporting fix.
39652 Detect misspelled pathspec to git-add
39653 packed objects: minor cleanup
39654 topo-order: make --date-order optional.
39655 pack-objects: reuse data from existing packs.
39656 pack-objects: finishing touches.
39657 git-repack: allow passing a couple of flags to pack-objects.
39658 git-tag: -l to list tags (usability).
39659 Add contrib/README.
39660 SubmittingPatches: note on whitespaces
39661 pack-objects: avoid delta chains that are too long.
39662 Make "empty ident" error message a bit more helpful.
39663 Delay "empty ident" errors until they really matter.
39664 Keep Porcelainish from failing by broken ident after making changes.
39665 fmt-merge-msg: say which branch things were merged into unless 'master'
39666 Allow git-mv to accept ./ in paths.
39667 Documentation: fix typo in rev-parse --short option description.
39668 fmt-merge-msg: do not add excess newline at the end.
39669 rev-list --objects-edge
39670 Thin pack - create packfile with missing delta base.
39671 send-pack --thin: use "thin pack" delta transfer.
39672 Add git-push --thin.
39673 Use thin pack transfer in "git fetch".
39674 fmt-merge-msg: avoid open "-|" list form for Perl 5.6
39675 rerere: avoid open "-|" list form for Perl 5.6
39676 send-email: avoid open "-|" list form for Perl 5.6
39677 svnimport: avoid open "-|" list form for Perl 5.6
39678 cvsimport: avoid open "-|" list form for Perl 5.6
39679 Fix fmt-merge-msg counting.
39680 cherry-pick/revert: error-help message rewording.
39681 git-mktree: reverse of git-ls-tree.
39682 rev-list.c: fix non-grammatical comments.
39683 send-pack: do not give up when remote has insanely large number of refs.
39684 gitview: ls-remote invocation shellquote safety.
39685 pack-objects: thin pack micro-optimization.
39686 pack-objects: use full pathname to help hashing with "thin" pack.
39687 count-delta: tweak counting of copied source material.
39688 count-delta: fix counting of copied source.
39689 Tweak break/merge score to adjust to the new delta generation code.
39690 pack-objects: allow "thin" packs to exceed depth limits
39691 rev-list --objects-edge: remove duplicated edge commit output.
39692 rev-list --objects: use full pathname to help hashing.
39693 pack-objects: hash basename and direname a bit differently.
39694 Revert "diff-delta: produce optimal pack data"
39695 Build and install git-mailinfo.
39696 rev-list split: minimum fixup.
39697 apply --whitespace fixes and enhancements.
39698 apply: squelch excessive errors and --whitespace=error-all
39699 apply --whitespace: configuration option.
39700 git-apply --whitespace=nowarn
39701 Revert "Revert "diff-delta: produce optimal pack data""
39702 git-apply: war on whitespace -- finishing touches.
39703 diffcore-break: micro-optimize by avoiding delta between identical files.
39704 diffcore-rename: split out the delta counting code.
39705 diffcore-delta: stop using deltifier for packing.
39706 git-am: --whitespace=x option.
39707 diff-delta: cull collided hash bucket more aggressively.
39708 git-log (internal): add approxidate.
39709 git-log (internal): more options.
39710 Pretty-print tagger dates.
39711 war on whitespaces: documentation.
39712 Documentation: read-tree --aggressive
39713 Documentation: rev-list --objects-edge
39714 annotate: resurrect raw timestamps.
39715 setup_revisions(): handle -n<n> and -<n> internally.
39716 GIT-VERSION-GEN: squelch unneeded error from "cat version"
39717 show-branch --topics
39719 git-commit: make sure we protect against races.
39720 diffcore-rename: similarity estimator fix.
39721 show-branch --topics: omit more uninteresting commits.
39722 count-delta: no need for this anymore.
39723 diffcore-break: similarity estimator fix.
39724 diffcore-delta: make change counter to byte oriented again.
39725 git-commit --amend: allow empty commit.
39727 verify-pack -v: show delta-chain histogram.
39728 blame: avoid -lm by not using log().
39729 blame and annotate: show localtime with timezone.
39730 blame: avoid "diff -u0".
39731 annotate/blame tests updates.
39732 annotate-blame test: don't "source", but say "."
39733 annotate-blame test: add evil merge.
39734 blame: unbreak "diff -U 0".
39735 annotate-blame: tests incomplete lines.
39736 pack-objects: simplify "thin" pack.
39737 Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
39738 refs.c::do_for_each_ref(): Finish error message lines with "\n"
39739 fsck-objects: Remove --standalone
39740 Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
39741 try_to_simplify_commit(): do not skip inspecting tree change at boundary.
39742 repack: prune loose objects when -d is given
39743 git-diff: -p disables rename detection.
39744 diffcore-rename: somewhat optimized.
39745 revision traversal: --remove-empty fix.
39746 revision traversal: --remove-empty fix (take #2).
39747 diffcore-delta: make the hash a bit denser.
39748 diffcore-delta: tweak hashbase value.
39749 cvsimport: honor -i and non -i upon subsequent imports
39750 fetch: exit non-zero when fast-forward check fails.
39751 cvsimport: fix reading from rev-parse
39752 git-pull: run repo-config with dash form.
39753 unpack_delta_entry(): reduce memory footprint.
39754 generate-cmdlist: style cleanups.
39756 git-merge knows some strategies want to skip trivial merges
39757 http-fetch: nicer warning for a server with unreliable 404 status
39758 core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
39759 revamp git-clone (take #2).
39760 get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
39761 clone: record the remote primary branch with remotes/$origin/HEAD
39762 http-push.c: squelch C90 warnings.
39763 git-apply: do not barf when updating an originally empty file.
39764 rev-list --timestamp
39765 git-clone: typofix.
39766 git-pull: further safety while on tracking branch.
39767 git-pull: reword "impossible to fast-forward" message.
39768 sha1_name: warning ambiguous refs.
39769 sha1_name: make core.warnambiguousrefs the default.
39770 send-email: Identify author at the top when sending e-mail
39771 commit-tree: check return value from write_sha1_file()
39772 built-in diff: minimum tweaks
39773 true built-in diff: run everything in-core.
39774 git-push: make --thin pack transfer the default.
39775 add clean and ignore rules for xdiff/
39779 git-svnimport: -r adds svn revision number to commit messages
39780 svnimport: Mention -r in usage summary
39781 svnimport: Convert executable flag
39782 svnimport: Convert the svn:ignore property
39783 svnimport: Read author names and emails from a file
39784 Let git-svnimport's author file use same syntax as git-cvsimport's
39785 Save username -> Full Name <email@addr.es> map file
39787 Linus Torvalds (21):
39788 Handling large files with GIT
39789 Handling large files with GIT
39790 git-merge-tree: generalize the "traverse <n> trees in sync" functionality
39791 Teach the "git" command to handle some commands internally
39792 First cut at libifying revlist generation
39793 Make git diff-generation use a simpler spawn-like interface
39794 The war on trailing whitespace
39795 Splitting rev-list into revisions lib, end of beginning.
39796 git-rev-list libification: rev-list walking
39797 Introduce trivial new pager.c helper infrastructure
39798 Tie it all together: "git log"
39799 Rip out merge-order and make "git log <paths>..." work again.
39800 get_revision(): do not dig deeper when we know we are at the end.
39801 git-fmt-merge-msg cleanup
39802 Fix up diffcore-rename scoring
39803 diffcore-delta: 64-byte-or-EOL ultrafast replacement.
39804 diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).
39805 git-apply: safety fixes
39806 Use a *real* built-in diff generator
39807 builtin-diff: \No newline at end of file.
39808 Fix error handling for nonexistent names
39810 Lukas Sandström (1):
39811 git-fetch: print the new and old ref when fast-forwarding
39813 Marco Costalba (1):
39814 Add a Documentation/git-tools.txt
39817 imap-send: cleanup execl() call to use NULL sentinel instead of 0
39820 Let merge set the default strategy.
39823 combine-diff: Honour --full-index.
39824 combine-diff: Honour -z option correctly.
39825 Documentation/Makefile: Some `git-*.txt' files aren't manpages.
39826 gitignore: Ignore some more boring things.
39827 contrib/emacs/Makefile: Provide tool for byte-compiling files.
39828 annotate-tests: override VISUAL when running tests.
39830 Martin Langhoff (18):
39831 Introducing git-cvsserver -- a CVS emulator for git.
39832 cvsserver: add notes on how to get a checkout under Eclipse
39833 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
39834 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
39835 cvsserver: add notes on how to get a checkout under Eclipse
39836 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
39837 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
39838 cvsserver: Checkout correctly on Eclipse
39839 annotate: fix -S parameter to take a string
39840 cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
39841 cvsserver: checkout faster by sending files in a sensible order
39842 cvsserver: fix checkouts with -d <somedir>
39843 cvsserver: checkout faster by sending files in a sensible order
39844 cvsserver: fix checkouts with -d <somedir>
39845 cvsserver: nested directory creation fixups for Eclipse clients
39846 cvsserver: better error messages
39847 cvsserver: anonymous cvs via pserver support
39848 cvsserver: updated documentation
39851 gitk: Make error_popup react to Return
39853 Matthias Urlichs (2):
39854 cvsimport: Remove master-updating code
39855 Don't recurse into parents marked uninteresting.
39857 Mike McCormack (5):
39858 Allow adding arbitary lines in the mail header generated by format-patch.
39859 Allow format-patch to attach patches
39860 Document the --attach flag.
39861 Describe how to add extra mail header lines in mail generated by git-format-patch.
39862 Add git-imap-send, derived from isync 1.0.1.
39864 Nick Hengeveld (10):
39865 Update http-push functionality
39866 http-push: fix revision walk
39867 HTTP slot reuse fixes
39868 http-push: refactor remote file/directory processing
39869 http-push: improve remote lock management
39870 http-push: support for updating remote info/refs
39872 Fix broken slot reuse when fetching alternates
39873 http-push: add support for deleting remote branches
39874 http-push: don't assume char is signed
39876 Nicolas Pitre (11):
39877 relax delta selection filtering in pack-objects
39878 diff-delta: fold two special tests into one plus cleanups
39879 diff-delta: produce optimal pack data
39880 diff-delta: big code simplification
39881 diff-delta: bound hash list length to avoid O(m*n) behavior
39882 diff-delta: produce optimal pack data
39883 diff-delta: bound hash list length to avoid O(m*n) behavior
39884 diff-delta: allow reusing of the reference buffer index
39885 test-delta needs zlib to compile
39886 diff-delta: bound hash list length to avoid O(m*n) behavior
39887 3% tighter packs for free
39890 allow double click on current HEAD id after git-pull
39893 Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
39895 Paul Mackerras (13):
39896 gitk: Make "find" on "Files" work again.
39897 gitk: New improved gitk
39898 gitk: Fix clicks on arrows on line ends
39899 gitk: Fix Update menu item
39900 gitk: Various speed improvements
39901 gitk: Further speedups
39902 gitk: Fix a bug in drawing the selected line as a thick line
39903 gitk: Fix display of diff lines beginning with --- or +++
39904 gitk: Make commitdata an array rather than a list
39905 gitk: Don't change cursor at end of layout if find in progress
39906 gitk: Make downward-pointing arrows end in vertical line segment
39907 gitk: Improve appearance of first child links
39908 gitk: Fix two bugs reported by users
39911 gitview: Select the text color based on whether the entry in highlighted. Use standard font.
39914 Properly git-bisect reset after bisecting from non-master head
39915 Optionally do not list empty directories in git-ls-files --others
39917 Randal L. Schwartz (1):
39918 fix imap-send for OSX
39921 tar-tree: Use SHA1 of root tree for the basedir
39922 tar-tree: Introduce write_entry()
39923 tar-tree: Use write_entry() to write the archive contents
39924 tar-tree: Remove obsolete code
39925 tar-tree: Use the prefix field of a tar header
39928 send-email: Add some options for controlling how addresses are automatically added to the cc: list.
39929 send-email: Add --cc
39930 Add git-annotate, a tool for assigning blame.
39931 annotate: Handle dirty state and arbitrary revisions.
39932 annotate: Convert all -| calls to use a helper open_pipe().
39933 annotate: Use qx{} for pipes on activestate.
39934 annotate: handle \No newline at end of file.
39935 annotate: Add a basic set of test cases.
39936 annotate: Support annotation of files on other revisions.
39938 Sean Estabrooks (1):
39939 annotate.perl triggers rpm bug
39941 Shawn O. Pearce (7):
39942 git ls files recursively show ignored files
39943 Add missing programs to ignore list
39944 Darwin: Ignore missing /sw/lib
39945 Teach git-checkout-index to read filenames from stdin.
39946 Prevent --index-info from ignoring -z.
39947 Add --temp and --stage=all options to checkout-index.
39948 Add missing semicolon to sed command.
39951 Use setenv(), fix warnings
39954 fix warning from pack-objects.c
39955 Re-fix compilation warnings.
39956 annotate should number lines starting with 1
39957 fix field width/precision warnings in blame.c
39960 Be verbose when !initial commit
39963 Version v1.2.6; changes since v1.2.5:
39964 -------------------------------------
39966 Junio C Hamano (3):
39967 parse_date(): fix parsing 03/10/2006
39968 diff_flush(): leakfix.
39969 count-delta: match get_delta_hdr_size() changes.
39972 check patch_delta bounds more carefully
39975 Version v1.2.5; changes since v1.2.4:
39976 -------------------------------------
39979 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
39981 Junio C Hamano (3):
39982 read-tree --aggressive: remove deleted entry from the working tree.
39983 tar-tree: file/dirmode fix.
39984 safe_fgets() - even more anal fgets()
39986 Linus Torvalds (2):
39987 Fix Solaris stdio signal handling stupidities
39988 pack-objects: be incredibly anal about stdio semantics
39991 Version v1.2.4; changes since v1.2.3:
39992 -------------------------------------
39995 fix t5600-clone-fail-cleanup.sh on windows
39997 Josef Weidendorfer (2):
39998 git-mv: Allow -h without repo & fix error message
39999 git-mv: fixes for path handling
40001 Junio C Hamano (13):
40002 checkout - eye candy.
40003 Give no terminating LF to error() function.
40004 diffcore-rename: plug memory leak.
40005 git-am: do not allow empty commits by mistake.
40006 sample hooks template.
40007 apply --whitespace fixes and enhancements.
40008 apply: squelch excessive errors and --whitespace=error-all
40009 apply --whitespace: configuration option.
40010 git-apply --whitespace=nowarn
40011 git-apply: war on whitespace -- finishing touches.
40012 git-am: --whitespace=x option.
40013 diffcore-break: micro-optimize by avoiding delta between identical files.
40014 Allow git-mv to accept ./ in paths.
40016 Linus Torvalds (1):
40017 The war on trailing whitespace
40020 combine-diff: Honour --full-index.
40021 combine-diff: Honour -z option correctly.
40024 Version v1.2.3; changes since v1.2.2:
40025 -------------------------------------
40028 git-add: Add support for --, documentation, and test.
40029 git-push: Update documentation to describe the no-refspec behavior.
40031 Junio C Hamano (11):
40032 format-patch: pretty-print timestamp correctly.
40033 detect broken alternates.
40034 pack-objects: reuse data from existing packs.
40035 pack-objects: finishing touches.
40036 git-repack: allow passing a couple of flags to pack-objects.
40037 pack-objects: avoid delta chains that are too long.
40038 Make "empty ident" error message a bit more helpful.
40039 Delay "empty ident" errors until they really matter.
40040 Keep Porcelainish from failing by broken ident after making changes.
40041 pack-objects eye-candy: finishing touches.
40042 git-fetch: follow tag only when tracking remote branch.
40045 nicer eye candies for pack-objects
40046 also adds progress when actually writing a pack
40049 Version v1.2.2; changes since v1.2.1:
40050 -------------------------------------
40053 Trap exit to clean up created directory if clone fails.
40054 Abstract test_create_repo out for use in tests.
40055 Prevent git-upload-pack segfault if object cannot be found
40058 archimport: remove files from the index before adding/updating
40061 git-rev-parse: Fix --short= option parsing
40062 Document --short and --git-dir in git-rev-parse(1)
40065 Fix retries in git-cvsimport
40067 Shawn O. Pearce (1):
40068 Make git-reset delete empty directories
40071 Version v1.2.1; changes since v1.2.0:
40072 -------------------------------------
40074 Fernando J. Pereda (1):
40075 Print an error if cloning a http repo and NO_CURL is set
40077 Fredrik Kuivinen (1):
40078 s/SHELL/SHELL_PATH/ in Makefile
40080 Josef Weidendorfer (1):
40081 More useful/hinting error messages in git-checkout
40083 Junio C Hamano (6):
40084 Documentation: git-commit in 1.2.X series defaults to --include.
40085 Documentation: git-ls-files asciidocco.
40086 bisect: remove BISECT_NAMES after done.
40087 combine-diff: diff-files fix.
40088 combine-diff: diff-files fix (#2)
40089 checkout: fix dirty-file display.
40092 Version v1.2.0; changes since v1.1.6:
40093 -------------------------------------
40096 Add freebsd support in Makefile
40099 fix "test: 2: unexpected operator" on bsd
40100 avoid echo -e, there are systems where it does not work
40102 Andreas Ericsson (4):
40103 git-cvsimport: Add -A <author-conv-file> option
40104 update-hook: Major overhaul (handling tags, mainly).
40105 format-patch: Remove last vestiges of --mbox option
40106 .gitignore git-rerere and config.mak
40108 Christian Biesinger (1):
40109 Use a relative path for SVN importing
40111 Daniel Barkalow (4):
40112 Only use a single parser for tree objects
40113 Use struct tree in tar-tree
40114 Use struct commit in tar-tree
40115 Make apply accept the -pNUM option like patch does.
40117 Eric W. Biederman (1):
40118 Fix git-format-patch -s to include a Signed-off-by: line...
40121 rev-list: allow -n<n> as shorthand for --max-count=<n>
40122 rev-list: allow -<n> as shorthand for --max-count=<n>
40124 Florian Weimer (1):
40125 AsciiDoc fixes for the git-svnimport manpage
40127 Fredrik Kuivinen (2):
40128 merge-recursive: Make use of provided bases
40129 merge-recursive: Speed up commit graph construction
40131 J. Bruce Fields (7):
40132 Minor git-reset and git-commit documentation fixes
40133 Mention install-doc in INSTALL
40135 cvs-migration documentation update
40136 Docs: split up pull-fetch-param.txt
40137 Docs: move git url and remotes text to separate sections
40138 Docs: minor git-push copyediting
40141 Run GIT-VERSION-GEN with $(SHELL), not sh.
40142 Add compat/unsetenv.c .
40143 Use sha1_file.c's mkdir-like routine in apply.c.
40144 stat() for existence in safe_create_leading_directories()
40146 Johannes Schindelin (1):
40147 Use a hashtable for objects instead of a sorted list
40150 Add --diff-filter= documentation paragraph
40152 Junio C Hamano (112):
40153 show-branch: take default arguments from configuration file.
40154 git-describe: default to HEAD
40155 Makefile: add 'strip' target
40156 octopus: allow criss-cross and clarify the message when it rejects
40157 Fix the installation location.
40158 checkout: automerge local changes while switching branches.
40159 checkout: merge local modifications while switching branches.
40160 git-push: avoid falling back on pushing "matching" refs.
40161 checkout: show dirty state upon switching branches.
40162 clone: --naked option.
40163 format-patch: always --mbox and show sane Date:
40164 octopus: allow manual resolve on the last round.
40165 Documentation: show-branch.
40166 show-branch: make the current branch and merge commits stand out.
40167 show-branch: --current includes the current branch.
40168 cvsimport: ease migration from CVSROOT/users format
40169 git-push: fix --tags and document it.
40170 Allow building of RPM from interim snapshot.
40171 Revert "git-push: avoid falling back on pushing "matching" refs."
40172 Makefile: do not assume lack of IPV6 means no sockaddr_storage.
40173 fsck-objects: support platforms without d_ino in struct dirent.
40174 DT_UNKNOWN: do not fully trust existence of DT_UNKNOWN
40175 t4011: "sleep 1" is not enough on FAT
40176 Undef DT_* before redefining them.
40177 git-grep: clarification on parameters.
40178 Recommend to remove unused `origin` in a shared repository.
40179 Documentation: finishing touches to the new tutorial.
40180 sample update-hook: sanely handle a new branch head.
40181 git-clone: PG13 --naked option to --bare.
40182 clone: do not create remotes/origin nor origin branch in a bare repository.
40183 clone: do not accept more than one -o option.
40184 tests: adjust breakage by stricter rev-parse
40185 git-fetch --upload-pack: disambiguate.
40186 merge: seed the commit message with list of conflicted files.
40187 diff-tree -c: show a merge commit a bit more sensibly.
40188 diff-tree --cc: denser combined diff output for a merge commit.
40189 combine-diff: fix appending at the tail of a list.
40190 combine-diff: minor output changes.
40191 combine-diff: extend --cc logic to Octopus.
40192 diff-tree --cc: squelch header generation on empty patch.
40193 combine-diff: better hunk splitting.
40194 diff-files: -c and --cc options.
40195 rev-list --remove-empty: add minimum help and doc entry.
40196 abbrev cleanup: use symbolic constants
40197 rev-parse: --abbrev option.
40198 diff-tree: abbreviate merge parent object names with --abbrev --pretty.
40199 rev-parse --abbrev: do not try abbrev shorter than minimum.
40200 Rename rev-parse --abbrev to --short.
40201 pretty_print_commit(): pass commit object instead of commit->buffer.
40202 pretty_print_commit: honor grafts.
40203 diff --abbrev=<n> option fix.
40204 rev-parse: make "whatchanged -- git-fetch-script" work again.
40205 diff-files -c/--cc: combine only when both ours and theirs exist.
40206 Documentation: diff -c/--cc
40207 documentation: cvs migration - typofix.
40208 update-index --index-info: allow stage 0 entries.
40209 rev-list: omit duplicated parents.
40210 combine-diff: reuse diff from the same blob.
40211 combine-diff: update --cc "uninteresting hunks" logic.
40212 combine-diff: add safety check to --cc.
40213 combine-diff: fix placement of deletion.
40214 Documentation: git-diff-tree --cc also omits empty commits
40215 commit.c: "Merge" fix in pretty_print_commit.
40216 combine-diff: add a bit more comments.
40217 combine-diff: show parent line numbers as well.
40218 combine-diff: cleanup.
40219 combine-diff: finishing touches to git-diff-tree --cc
40220 whitespace cleanup.
40221 get_sha1_1: allow octopus^12 to be properly parsed.
40222 git-merge: Properly quote $merge_msg variable.
40223 Do not fall back on vi on dumb terminals.
40224 diff-index: make --cc a synonym for -p for now.
40225 git-diff: use --cc instead of -p.
40227 daemon: do not forbid user relative paths unconditionally under --base-path
40228 daemon: extend user-relative path notation.
40229 combine-diff: remove misguided --show-empty hack.
40230 git-diff-tree --stdin: show all parents.
40231 git-diff: do not fall back on --cc when -[123], --ours etc. are given.
40232 core-tutorial: adjust to recent reality.
40233 combine-diff: do not send NULL to printf
40234 combine-diff: show mode changes as well.
40235 combine-diff: do not punt on removed or added files.
40236 mailinfo: reset CTE after each multipart
40237 read-tree --aggressive
40238 fmt-merge-msg: show summary of what is merged.
40239 git-rerere: reuse recorded resolve.
40240 git-commit: revamp the git-commit semantics.
40241 git-commit: finishing touches.
40242 Do not allow empty name or email.
40243 t6000: fix a careless test library add-on.
40244 ls-files: honour per-directory ignore file from higher directories.
40245 combined-diff: use diffcore before intersecting paths.
40246 call git_config() after setup_git_directory()
40247 combine-diff: move formatting logic to show_combined_diff()
40248 count-delta.c: Match the delta data semantics change in version 3.
40250 find_unique_abbrev() simplification.
40251 combine-diff: Record diff status a bit more faithfully
40252 rev-list: default to abbreviate merge parent names under --pretty.
40253 git-commit -v: have patch at the end.
40254 Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
40255 fetch-clone progress: finishing touches.
40256 Only call git-rerere if $GIT_DIR/rr-cache exists.
40257 t5500: adjust to change in pack-object reporting behaviour.
40258 diff-tree: do not default to -c
40259 Avoid using "git-var -l" until it gets fixed.
40260 hashtable-based objects: minimum fixups.
40261 Make pack-objects chattier.
40262 git-commit: show dirtiness including index.
40263 Fix "test: unexpected operator" on bsd
40267 Add howto about separating topics.
40269 Linus Torvalds (14):
40270 Make git-rev-list and git-rev-parse argument parsing stricter
40271 git-whatchanged: exit out early on errors
40272 rev-list: stop when the file disappears
40273 Make the "struct tree_desc" operations available to others
40274 Make git-tar-tree use the tree_desc abstractions
40275 Fix git-rev-parse over-eager errors
40276 diff-tree --always flag
40277 rev-parse lstat() workaround cleanup.
40278 Fix "git diff a..b" breakage
40279 diff-tree -c raw output
40280 Make "git clone" less of a deathly quiet experience
40281 Make "git clone" pack-fetching download statistics better
40282 Fix fetch-clone in the presense of signals
40283 Fix object re-hashing
40286 daemon: Provide missing argument for logerror() call.
40287 http-fetch: Fix object list corruption in fill_active_slots().
40288 http-fetch: Fix message reporting rename of object file.
40289 http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment
40290 http-fetch: Tidy control flow in process_alternate_response
40291 daemon: Set SO_REUSEADDR on listening sockets.
40292 http-fetch: Abort requests for objects which arrived in packs
40294 Martin Langhoff (3):
40295 cvsimport: Add -S <skipfileregex> support and -v announces files retrieved
40296 exportcommit: replace backticks with safe_pipe_capture() or system() - initial pass
40297 cvsexportcommit: add some examples to the documentation
40300 local push/pull env cleanup
40302 Michal Ostrowski (3):
40303 Exec git programs without using PATH.
40304 git-fetch: pass --upload-pack to fetch-pack
40305 git-{fetch,peek-remote} handling of --upload-pack
40307 Nick Hengeveld (2):
40308 Fix HTTP request result processing after slot reuse
40309 Use local structs for HTTP slot callback data
40312 remove delta-against-self bit
40313 count-delta.c: comment fixes
40314 delta micro optimization
40316 Paul Mackerras (2):
40317 gitk: Add braces around if expressions
40318 gitk: Use git-diff-tree --cc for showing the diffs for merges
40321 Disable USE_SYMLINK_HEAD by default
40322 Don't include ../README in git.txt - make a local copy
40325 Use adler32() from zlib instead of defining our own.
40328 Document git-ls-files --directory
40329 Allow diff and index commands to be interrupted
40330 Document git-diff-tree --always
40331 Basic documentation for git-show
40332 Add support for explicit type specifiers when calling git-repo-config
40335 Provide a more meaningful initial "From " line when using --compose in git-send-email.
40336 git-send-email: Add --quiet to reduce some of the chatter when sending emails.
40337 git-send-email: Fully implement --quiet and document it.
40339 Sasha Khapyorsky (1):
40340 git-svnimport.perl: fix for 'arg list too long...'
40343 Add --keep option to keep downloaded packs to git-fetch.
40346 update using-topic-branches
40348 Uwe Kleine-König (3):
40349 Fix generation of "humanish" part of source repo
40350 Remove unneeded header
40351 Use symbolic name SHORT_NAME_AMBIGUOUS as error return value
40353 Uwe Zeisberger (1):
40354 Make GIT-VERSION-GEN tolerate missing git describe command again
40357 Version v1.1.6; changes since v1.1.5:
40358 -------------------------------------
40360 Fredrik Kuivinen (2):
40361 merge-recursive: Improve the error message printed when merge(1) isn't found.
40362 git-branch: Documentation fixes
40364 J. Bruce Fields (1):
40365 git push -f documentation
40367 Junio C Hamano (1):
40368 pre-commit sample hook: do not barf on the initial import
40371 Version v1.1.5; changes since v1.1.4:
40372 -------------------------------------
40374 Junio C Hamano (1):
40375 checkout: do not make a temporary copy of symlink target.
40378 Version v1.1.4; changes since v1.1.3:
40379 -------------------------------------
40381 Johannes Schindelin (1):
40382 git-fetch-pack: really do not ask for funny refs
40384 Junio C Hamano (1):
40385 Revert "check_packed_git_idx(): check integrity of the idx file itself."
40388 Version v1.1.3; changes since v1.1.2:
40389 -------------------------------------
40391 Junio C Hamano (2):
40392 diffcore-break/diffcore-rename: integer overflow.
40393 describe: omit clearing marks on the last one.
40396 Version v1.1.2; changes since v1.1.1:
40397 -------------------------------------
40399 J. Bruce Fields (1):
40400 Documentation: clarify fetch parameter descriptions.
40402 Junio C Hamano (6):
40403 update-index: work with c-quoted name
40404 describe: do not silently ignore indescribable commits
40405 name-rev: do not omit leading components of ref name.
40406 show-branch: handle [] globs as well.
40407 Documentation: git-commit -a
40408 Documentation: git-reset - interrupted workflow.
40411 Add git-describe to .gitignore.
40414 Version v1.1.1; changes since v1.1.0:
40415 -------------------------------------
40417 H. Peter Anvin (1):
40418 For release tarballs, include the proper version
40420 Johannes Schindelin (1):
40421 glossary: explain "master" and "origin"
40423 Junio C Hamano (1):
40424 GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.
40427 Version v1.1.0; changes since v1.0.13:
40428 --------------------------------------
40430 Johannes Schindelin (3):
40431 git-clone: Support changing the origin branch with -o
40432 Introduce core.sharedrepository
40433 git-init-db: initialize shared repositories with --shared
40436 Make GIT-VERSION-GEN tolerate missing git describe command
40438 Junio C Hamano (23):
40439 Post 1.0.0 development track.
40440 Versioning scheme changes.
40441 merge-recursive: conflicting rename case.
40442 whatchanged: customize diff-tree output
40443 rev-parse: --show-cdup
40444 check_packed_git_idx(): check integrity of the idx file itself.
40445 checkout: sometimes work from a subdirectory.
40446 ls-tree: chomp leading directories when run from a subdirectory
40447 git-clone: do not special case dumb http.
40448 Tutorial: mention shared repository management.
40449 git-describe: really prefer tags only.
40450 git-describe: use find_unique_abbrev()
40451 git-describe: --tags and --abbrev
40452 git-describe: still prefer annotated tag under --all and --tags
40453 git-describe: documentation.
40454 Makefile: use git-describe to mark the git version.
40455 send-pack/receive-pack: allow errors to be reported back to pusher.
40456 git-fetch: auto-following tags.
40457 ls-files --others --directory: fix a bug with index entry ordering
40458 ls-files --others --directory: give trailing slash
40459 git-status: use ls-files --others --directory for untracked list.
40460 ls-files --others --directory: test
40461 describe: allow more than one revs to be named.
40463 Linus Torvalds (2):
40464 Add a "git-describe" command
40465 ls-files -o: optionally skip showing the contents in "untracked" directories
40467 Lukas Sandström (1):
40468 git-pack-redundant: speed and memory usage improvements
40471 git-daemon --base-path
40473 YOSHIFUJI Hideaki (1):
40474 GIT: Support [address] in URLs
40477 Add an optional limit to git-cherry
40478 Add a minimal test for git-cherry
40479 Add a test for rebase when a change was picked upstream
40482 Version v1.0.13; changes since v1.0.12:
40483 ---------------------------------------
40485 Junio C Hamano (1):
40486 checkout: do not make a temporary copy of symlink target.
40489 Version v1.0.12; changes since v1.0.11:
40490 ---------------------------------------
40492 Johannes Schindelin (1):
40493 git-fetch-pack: really do not ask for funny refs
40495 Junio C Hamano (1):
40496 Revert "check_packed_git_idx(): check integrity of the idx file itself."
40499 Version v1.0.11; changes since v1.0.10:
40500 ---------------------------------------
40502 Junio C Hamano (1):
40503 diffcore-break/diffcore-rename: integer overflow.
40506 Version v1.0.10; changes since v1.0.9:
40507 --------------------------------------
40509 J. Bruce Fields (1):
40510 Documentation: clarify fetch parameter descriptions.
40512 Junio C Hamano (5):
40513 update-index: work with c-quoted name
40514 name-rev: do not omit leading components of ref name.
40515 show-branch: handle [] globs as well.
40516 Documentation: git-commit -a
40517 Documentation: git-reset - interrupted workflow.
40520 Version v1.0.9; changes since v1.0.8:
40521 -------------------------------------
40523 Johannes Schindelin (1):
40524 glossary: explain "master" and "origin"
40527 Version v1.0.8; changes since v1.0.7:
40528 -------------------------------------
40531 Substitute "/" with $opt_s in tag names as well as branch names
40533 Junio C Hamano (7):
40534 unpack-objects: default to quiet if stderr is not a tty.
40535 Retire debian/ directory.
40536 prune: do not show error from pack-redundant when no packs are found.
40537 Compilation: zero-length array declaration.
40538 tar-tree: finish honoring extractor's umask in git-tar-tree.
40539 revert/cherry-pick: handle single quote in author name.
40540 mailsplit: allow empty input from stdin
40543 Teach cvsexportcommit to add new files
40544 Fix typo in debug stanza of t2001
40545 Fix git-format-patch usage string wrt output modes.
40548 Version v1.0.7; changes since v1.0.6:
40549 -------------------------------------
40552 trivial: retval of waitpid is not errno
40553 trivial: O_EXCL makes O_TRUNC redundant
40554 fix potential deadlock in create_one_file
40555 use result of open(2) to check for presence
40556 trivial: typo in git-commit.sh
40557 trivial: clarify, what are the config's user.name and user.email about
40558 trivial: remove the dots at the end of file names from merge-one-file
40559 trivial: use git-repo-config to detect if the test can be run on the repository
40560 trivial: use git-repo-config to detect how to run tests in the test repository
40561 trivial: .gitignore precompiled python modules
40562 trivial: check, if t/trash directory was successfully created
40563 use GIT_DIR instead of /var/tmp
40565 Amos Waterland (1):
40566 AIX compile fix for repo-config.c
40568 Andreas Ericsson (1):
40569 git: grok 'help' to mean '--help'.
40572 svnimport: support repositories requiring SSL authentication
40573 Documentation/git-svnimport: document -T and -t switches correctly
40576 Fix skipping merge-order test with NO_OPENSSL=1.
40579 Fix git-symbolic-ref typo in git.txt.
40582 git-init-db(1): Describe --shared and the idempotent nature of init-db
40583 Wrap synopsis lines and use [verse] to keep formatting
40585 Junio C Hamano (6):
40586 Documentation: spell.
40587 code comments: spell
40588 ?alloc: do not return NULL when asked for zero bytes
40589 git-fetch --tags: reject malformed tags.
40590 format-patch/commit: Quote single quote in the author name properly.
40591 t3300: skip when filesystem does not like TAB in filenames.
40593 Linus Torvalds (1):
40594 Fix nasty approxidate bug
40597 Version v1.0.6; changes since v1.0.5:
40598 -------------------------------------
40600 Junio C Hamano (3):
40601 Guard a test against wc that pads its output with whitespace
40602 Fix bogus tests on rev-list output.
40603 Do not mark tags fetched via --tags flag as mergeable
40606 copy_fd: close ifd on error
40609 Version v1.0.5; changes since v1.0.4:
40610 -------------------------------------
40613 short circuit out of a few places where we would allocate zero bytes
40615 Johannes Schindelin (1):
40616 Handle symlinks graciously
40618 Junio C Hamano (2):
40619 avoid asking ?alloc() for zero bytes.
40620 t5300: avoid false failures.
40623 Version v1.0.4; changes since v1.0.3:
40624 -------------------------------------
40626 Junio C Hamano (5):
40627 check_packed_git_idx(): check integrity of the idx file itself.
40628 show-branch: usability updates.
40629 merge --no-commit: tweak message
40630 ls-files --full-name: usage string and documentation.
40631 mailinfo: iconv does not like "latin-1" -- should spell it "latin1"
40634 Version v1.0.3; changes since v1.0.2:
40635 -------------------------------------
40638 \n usage in stderr output
40640 Johannes Schindelin (2):
40641 git-format-patch should show the correct version
40642 sha1_to_hex: properly terminate the SHA1
40644 Junio C Hamano (1):
40645 send-pack: reword non-fast-forward error message.
40647 Nick Hengeveld (1):
40648 Fix for http-fetch from file:// URLs
40651 sanity check in add_packed_git()
40654 Version v1.0.2; changes since v1.0.1:
40655 -------------------------------------
40657 Junio C Hamano (1):
40658 server-info: skip empty lines.
40661 quote.c: Make loop control more readable.
40664 Version v1.0.1; changes since v1.0.0b:
40665 --------------------------------------
40668 Version v1.0.0b; changes since v1.0.0a:
40669 ---------------------------------------
40671 Junio C Hamano (1):
40672 server-info: skip empty lines.
40675 quote.c: Make loop control more readable.
40678 Version v1.0.0a; changes since v1.0.0:
40679 --------------------------------------
40681 Johannes Schindelin (1):
40682 Avoid misleading success message on error
40684 Junio C Hamano (3):
40685 objects/info/packs: work around bug in http-fetch.c::fetch_indices()
40686 http-fetch.c: fix objects/info/pack parsing.
40690 An off-by-one bug found by valgrind
40693 Version v1.0.0; changes since v1.0rc6:
40694 --------------------------------------
40697 Documentation/git-archimport: document -o, -a, f, -D options
40699 Fredrik Kuivinen (3):
40700 git-diff: Usage string clean-up
40701 git-log: Add usage string
40702 git-whatchanged: Add usage string
40707 Johannes Schindelin (1):
40708 We do not like "HEAD" as a new branch name
40710 Junio C Hamano (32):
40711 clone-pack: make it usable for partial branch cloning.
40712 Documentation: tutorial
40713 get_sha1_basic(): corner case ambiguity fix
40715 Sort globbed refname in show-branch.
40716 refs.c: off-by-one fix.
40717 Examples of resetting.
40718 Forbid pattern maching characters in refnames.
40720 Documentation: HTTP needs update-server-info.
40721 Remove misguided branch disambiguation.
40722 Revert "refs.c: off-by-one fix."
40723 Revert "We do not like "HEAD" as a new branch name"
40724 Revert "get_sha1_basic(): corner case ambiguity fix"
40725 fetch-pack: -k option to keep downloaded pack.
40726 clone-pack: remove unused and undocumented --keep flag
40727 Documentation: typos and small fixes in "everyday".
40728 howto/using-topic-branches: Recommend public URL git://git.kernel.org/
40729 rev-list --objects: fix object list without commit.
40730 Documentation: stdout of update-hook is connected to /dev/null
40731 Remove generated files */*.py[co]
40732 Remove unused cmd-rename.sh
40734 tests: make scripts executable
40735 xread/xwrite: do not worry about EINTR at calling sites.
40736 diff: --abbrev option
40737 diff --abbrev: document --abbrev=<n> form.
40738 format-patch: make sure header and body are separated.
40741 ce_smudge_racily_clean_entry: explain why it works.
40742 A shared repository should be writable by members.
40744 Linus Torvalds (3):
40745 Make "git help" react to window size correctly
40746 Make "git help" sort git commands in columns
40747 Make "git-send-pack" less verbose by default
40749 Martin Langhoff (1):
40750 svnimport: exit cleanly when we are up to date
40753 small cleanup for diff-delta.c
40756 Version v1.0rc6; changes since v1.0rc5:
40757 ---------------------------------------
40759 Amos Waterland (1):
40760 git rebase loses author name/email if given bad email address
40762 Fredrik Kuivinen (12):
40763 Usage message clean-up, take #2
40764 Trivial usage string clean-up
40765 git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation
40766 git-revert: Usage string clean-up
40767 git-am: Usage string clean-up
40768 git-applypatch: Usage string clean-up, emit usage string at incorrect invocation
40769 git-cherry: Usage string clean-up, use the 'usage' function
40770 git-fetch: Usage string clean-up, emit usage string at unrecognized option
40771 git-lost-found: Usage string clean-up, emit usage string at incorrect invocation
40772 git-prune: Usage string clean-up, use the 'usage' function
40773 git-rebase: Usage string clean-up, emit usage string at incorrect invocation
40774 git-repack: Usage string clean-up, emit usage at incorrect invocation
40776 H. Peter Anvin (1):
40777 git-am support for naked email messages (take 2)
40779 Junio C Hamano (22):
40780 diffcore-break.c: check diff_delta() return value.
40781 Add deltifier test.
40782 diff-delta.c: allow delta with empty blob.
40783 Everyday: some examples.
40784 Revert "diff-delta.c: allow delta with empty blob."
40785 Revert "Add deltifier test."
40786 diffcore-break: do not break too small filepair.
40787 Everyday: a bit more example.
40788 Documentation: more examples.
40789 Documentation: fix missing links to git(7)
40790 Documentation: diff examples.
40791 Documentation: not learning core git commands.
40792 git-clone: tell the user a bit more about clone-pack failure.
40793 allow merging any committish
40794 checkout-index: fix checking out specific path.
40795 Everyday: a bit more examples.
40796 t3200: branch --help does not die anymore.
40797 applypatch: no need to do non-portable [[ ... ]]
40798 Documentation: topic branches
40799 rebase: do not get confused in fast-forward situation.
40800 Do not let errors pass by unnoticed when running `make check'.
40801 mailinfo and git-am: allow "John Doe <johndoe>"
40803 Lukas Sandström (1):
40804 Bugfixes for git-rebase
40806 Martin Atukunda (1):
40807 define MAXPATHLEN for hosts that don't support it
40810 Make git-send-pack exit with error when some refs couldn't be pushed out
40813 Version v1.0rc5; changes since v1.0rc4:
40814 ---------------------------------------
40817 use "git init-db" in tests
40819 Daniel Barkalow (3):
40820 Warn when send-pack does nothing
40821 Clean up file descriptors when calling hooks.
40822 Allow saving an object from a pipe
40825 archimport: first, make sure it still compiles
40826 archimport: remove String::ShellQuote dependency.
40827 archimport: fix -t tmpdir switch
40828 archimport: remove git wrapper dependency
40829 archimport: add -D <depth> and -a switch
40830 archimport: safer log file parsing
40831 archimport: Add the accurate changeset applyer
40832 archimport: Fix a bug I introduced in the new log parser
40833 archimport: fix a in new changeset applyer addition
40836 Document config.mak in INSTALL.
40837 Initial AIX portability fixes.
40838 Use printf rather than echo -n.
40841 Added documentation for few missing options.
40843 Junio C Hamano (51):
40844 compat/setenv: do not free what we fed putenv(3).
40845 git.c: two fixes, gitsetenv type and off-by-one error.
40846 show-branch: allow glob pattern to name branches to show.
40847 Documentation: rebase does not use cherry-pick anymore.
40848 struct tree: remove unused field "parent"
40849 git.c: remove excess output for debugging when command is too long.
40850 sha1_file.c: make sure packs in an alternate odb is named properly.
40851 server-info.c: drop unused D lines.
40852 server-info: stop sorting packs by latest date.
40853 server-info: throw away T computation as well.
40854 Documentation: talk about pathspec in bisect.
40855 Documentation: git-mv manpage workaround.
40856 Documentation: git-diff asciidoc table workaround.
40857 Documentation: push/receive hook references.
40858 Documentation: shared repository management in tutorial.
40859 server-info.c: use pack_local like everybody else.
40860 server-info.c: and two functions are not used anymore.
40861 config.c: remove unnecessary header in minimum configuration file.
40862 Clean up compatibility definitions.
40864 git-mv to work with Perl 5.6
40865 hash-object: -- and --help
40866 init-db: check extra arguments and complain.
40867 write-tree: check extra arguments and die but be a bit more helpful.
40868 Documentation: hash-object.
40869 Documentaiton (read-tree): update description of 3-way
40870 git-merge-one-file: resurrect leading path creation.
40871 qsort() ptrdiff_t may be larger than int
40872 checkout-index: allow checking out from higher stages.
40873 git-merge-one: new merge world order.
40874 update-index: allow --index-info to add higher stages.
40875 Documentation: git.html/git.7
40876 Documentation(glossary): minor formatting clean-ups.
40877 Documentation(cvs-migration): minor cleanups.
40878 Documentation(tutorial): adjust merge example to the new merge world order.
40879 refs.c: make sure leading directories exist before writing a ref.
40880 Make sure we use compat/subprocess.py with Python 2.3 while running tests.
40881 Documentation: recursive is the default strategy these days.
40882 show-branch: comment typo
40883 Documentation: git-prune
40884 qsort(): ptrdiff_t may be larger than int
40885 git-prune: never lose objects reachable from our refs.
40886 Use GIT_EXEC_PATH explicitly for initial git-init-db in tests.
40887 Everyday GIT with 20 commands
40888 Link Everyday GIT to main documentation tree.
40889 t3300: funny name test
40890 t0000: catch trivial pilot errors.
40891 format-patch: use same number of digits in numbers
40892 merge-recursive: leave unmerged entries in the index.
40893 merge-recursive: cleanup setIndexStages
40894 t/t6022: a new test for renaming merge.
40896 Nikolai Weibull (16):
40897 Document the --non-empty command-line option to git-pack-objects.
40898 Fix the description of --utf8 and --keep to git-am.
40899 Use uniform description for the '--' option.
40900 Documentation/git-commit.txt: Add long options and -- to documentation.
40901 Documentation/git-verify-pack.txt: added documentation for --.
40902 Documentation/git-cvsimport.txt: Fix a slight glitch in description heading.
40903 Documentation/git-cherry-pick: Add --replay and --no-commit.
40904 Add documentation for git-revert and git-cherry-pick.
40905 Add documentation for the --topo-order option to git-show-branch.
40906 Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names.
40907 Documentation/git-ls-remote.txt: Add -h and -t.
40908 Documentation/git-repack.txt: Add -l and -n.
40909 Documentation/git-http-fetch.txt: Document the commit-id argument.
40910 Documentation/git-update-server-info.txt: Add -f alias for --force to documentation.
40911 Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should come before OPTIONS).
40912 Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.
40914 Paul Mackerras (3):
40915 gitk: Factored out some common code into a new start_rev_list procedure
40916 gitk: Some improvements for the code for updating the display
40917 gitk: Work around Tcl's non-standard names for encodings
40920 Update the git-ls-tree documentation
40921 Document the --(no-)edit switch of git-revert and git-cherry-pick
40923 Sven Verdoolaege (1):
40924 gitk: add Update menu item.
40927 Version v1.0rc4; changes since v1.0rc3:
40928 ---------------------------------------
40931 Documentation/git-log.txt: trivial typo fix.
40934 speedup allocation in pack-redundant.c
40935 remove unused variable
40936 arguments cleanup and some formatting
40937 Add tests for git-mv in subdirectories
40938 git wrapper: more careful argument stuffing
40940 Alexander Litvinov (1):
40941 git-mv is not able to handle big directories
40943 Andreas Ericsson (13):
40944 git-daemon: --inetd implies --syslog
40945 C implementation of the 'git' program, take two.
40946 Update git(7) man-page for the C wrapper.
40947 git --help COMMAND brings up the git-COMMAND man-page.
40948 daemon.c: fix arg parsing bugs
40949 Library code for user-relative paths, take three.
40950 Server-side support for user-relative paths.
40951 Client side support for user-relative paths.
40952 Documentation update for user-relative paths.
40953 git-reset.txt: Small fix + clarifications.
40954 git-daemon support for user-relative paths.
40955 Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.
40956 cvsimport: Don't let local settings hinder cvs user-migration.
40959 remove shellquote usage for tags
40960 archimport: don't die on merge-base failure
40961 Disambiguate the term 'branch' in Arch vs git
40963 Frank Sorenson (1):
40964 gitk: Specify line hover font
40966 Fredrik Kuivinen (5):
40967 merge-recursive: Replace 'except:'
40968 git-merge: Exit with code 2 if no strategy was able to handle the merge.
40969 test-lib.sh: Add new function, test_expect_code
40970 New test case: merge with directory/file conflicts
40971 New test case: Criss-cross merge
40973 H. Peter Anvin (3):
40974 git-core-foo -> git-foo, except the core package
40975 rename/copy score parsing updates.
40976 A few more options for git-cat-file
40979 Fix typo in http-push.c
40982 Add compat/setenv.c, use in git.c.
40985 gitk: put braces around exprs
40987 Johannes Schindelin (13):
40988 Add config variable core.symrefsonly
40989 Fix tests with new git in C
40990 Give python a chance to find "backported" modules
40991 Add functions git_config_set() and git_config_set_multivar()
40992 Add git-config-set, a simple helper for scripts to set config variables
40993 Add documentation for git-config-set
40994 Add test case for git-config-set
40995 git-config-set: add more options
40996 git-config-set: support selecting values by non-matching regex
40997 git-config-set: Properly terminate strings with '\0'
40998 Allow hierarchical section names
40999 Rename git-config-set to git-repo-config
41000 Make git-mv work in subdirectories, too
41003 Fix typos and minor format issues.
41006 Fix git(1) link to git-index-pack
41008 Josef Weidendorfer (6):
41009 Fix git-mv for moving directories with 1 file
41010 git-mv: shrink usage, no usage on error
41011 git-mv: keep git index consistent with file system on failed rename
41012 git-mv: fully detect 'directory moved into itself'
41013 Small fixes in Documentation/git-mv.txt
41014 git-mv: follow -k request even on failing renames
41016 Junio C Hamano (108):
41017 Documentation: do not blindly run 'cat' .git/HEAD, or echo into it.
41018 diff: make default rename detection limit configurable.
41019 sha1_file.c::add_packed_git(): fix type mismatch.
41020 git wrapper: basic fixes.
41021 git-apply: fail if a patch cannot be applied.
41022 git-am: --resolved.
41023 apply: allow-binary-replacement.
41025 tests: binary diff application.
41026 Add approxidate test calls.
41027 Deal with binary diff output from GNU diff 2.8.7
41028 git-am: --binary; document --resume and --binary.
41029 git-prune: quote possibly empty $dryrun as parameter to test
41030 Cygwin *might* be helped with NO_MMAP
41031 Do not show .exe in git command list.
41032 git-branch: -f to forcibly reset branch head.
41033 Rewrite rebase to use git-format-patch piped to git-am.
41034 readrefs: grab all refs with one call to ls-remote.
41035 git-count-objects: dc replacement
41036 git-repack: do not do complex redundancy check.
41037 Documentation: rebase-from-internal minor updates.
41038 merge-one-file: remove empty directories
41039 merge-recursive::removeFile: remove empty directories
41040 http.c: reorder to avoid compilation failure.
41041 Do not DWIM in userpath library under strict mode.
41042 Documentation: add hooks/update example.
41043 merge-one-file: use rmdir -p
41044 Fix "do not DWIM" patch to enter_repo"
41045 Make sure heads/foo and tags/foo do not confuse things.
41046 Fix hooks/update template.
41047 format-patch: fix two-argument special case, and make it easier to pick single commits
41048 rename detection with -M100 means "exact renames only".
41049 tutorial: setting up a tree for subsystem maintainers
41050 daemon: further tweaks.
41052 Move diff.renamelimit out of default configuration.
41053 git-var: constness and globalness cleanup.
41054 pack-redundant: type cleanups.
41055 git-merge: make recursive the default strategy
41056 git-revert: make --edit default.
41057 Teach update-index to read from ls-tree.
41058 diff-tree: teach single-commit diff-tree to honour grafts
41059 config.c: avoid shadowing global.
41060 Prevent "git-commit -a path1 path2..."
41061 parse-remote and ls-remote clean-up.
41062 git-sh-setup: die if outside git repository.
41063 git-var: make it work in subdirectory.
41064 setup_git_directory: make sure GIT_DIR is a valid repository.
41065 git-sh-setup: move the repository check to a core program.
41066 shell.c: complain on insufficient arguments.
41067 name-rev: fix off-by-one error in --stdin.
41068 format-patch: output filename reported to stdout verbatim.
41069 Repository format version check.
41070 Check repository format version in enter_repo().
41071 init-db: check template and repository format.
41072 setup_git_directory(): check repository format version.
41073 Introduce i18n.commitencoding.
41074 mailinfo: allow -u to fall back on latin1 to utf8 conversion.
41075 mailinfo: Use i18n.commitencoding
41076 mailinfo: Do not use -u=<encoding>; say --encoding=<encoding>
41077 config.c: constness tightening to avoid compilation warning.
41078 gitk: Use i18n.commitencoding configuration item.
41079 git-mv: quote $src in regexp properly.
41080 rebase: one safety net, one bugfix and one optimization.
41081 name-rev: fix parent counting.
41082 Documentation: Describe merge operation a bit better.
41083 write_name_quoted(): make one of the path a counted string.
41084 ls-tree: Resurrect funny name quoting lost during rewrite.
41085 ls-tree: match the test to the new semantics.
41086 bisect: quote pathnames for eval safety.
41087 working from subdirectory: preparation
41088 git-apply: work from subdirectory.
41089 peek-remote: honor proxy config even from subdirectory.
41090 fsck-objects: work from subdirectory.
41091 checkout-index: work from subdirectory.
41092 hash-object: work within subdirectory.
41093 ls-tree: work from subdirectory.
41094 Make networking commands to work from a subdirectory.
41095 Make the rest of commands work from a subdirectory.
41096 count-objects: make it operable from a subdirectory.
41097 ls-remote: define die() now we do not use git-sh-setup
41098 branch: make it operable from a subdirectory.
41099 lost-found: make it operable from a subdirectory.
41100 tag: make it operable from a subdirectory.
41101 verify-tag: make it operable from a subdirectory.
41102 define die() for scripts that use it.
41103 hash-object.c: type-fix to squelch compiler warnings.
41104 applymbox: typofix to enable -m option.
41105 applypatch: use "index" lines not "applies-to".
41106 format-patch: remove applies-to.
41107 format-patch: do not abuse 3-dash marker line.
41108 format-patch: run diff in C locale
41109 git-diff: do not turn off -p/-M with any diff options.
41110 diff-files: show diffs with stage0 and unmerged stage at the same time.
41111 merge-recursive: match the unmerged index entry behaviour with merge-resolve
41112 Tutorial: adjust merge example to recursive strategy.
41113 Documentation: describe '-f' option to git-fetch.
41114 Makefile: say the default target upfront.
41115 ls-tree: resurrect '-d' to mean 'show trees only'
41116 ls-tree: --name-only
41117 git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
41118 merge-recursive: adjust git-ls-tree use for the latest.
41119 t3100: add ls-tree -t and -d tests.
41120 merge-one-file: make sure we create the merged file.
41121 merge-one-file: make sure we do not mismerge symbolic links.
41122 git-merge documentation: conflicting merge leaves higher stages in index
41123 documentation: git-bisect (help HTML break man)
41124 daemon.c and path.enter_repo(): revamp path validation.
41127 git-cvsexportcommit.perl: Fix usage() output.
41128 git-cvsexportcommit.perl: use getopts to get binary flags
41129 git-cvsexportcommit.perl: exit with non-0 status if patch fails.
41130 git-cvsexportcommit.perl: fix typos in output
41132 Linus Torvalds (14):
41133 Disallow empty pattern in "git grep"
41134 git's rev-parse.c function show_datestring presumes gnu date
41135 Teach "approxidate" about weekday syntax
41136 Make "git fetch" less verbose by default
41137 Teach "approxidate" about weekday syntax
41138 git-repack: Properly abort in corrupt repository
41139 Allow editing of a revert-message
41140 ls-tree: major rewrite to do pathspec
41141 ls-tree: further cleanup to parallel ls-files.
41142 ls-tree: further tweaks of the rewrite
41143 bisect: limit the searchspace by pathspecs
41144 diff-files: -1/-2/-3 to diff against unmerged stage.
41145 merge-one-file: leave unmerged index entries upon automerge failure.
41146 git-ls-tree: add "-t" option to always show the tree entries
41149 max-count in terms of intersection
41151 Lukas Sandström (8):
41152 Fix llist_sorted_difference_inplace in git-pack-redundant
41153 Make git-pack-redundant non-horribly slow on large sets of packs
41154 Fix bug introduced by the latest changes to git-pack-redundant
41155 Fix a bug in get_all_permutations.
41156 Remove all old packfiles when doing "git repack -a -d"
41157 Improve the readability of git-pack-redundant
41158 Document the "ignore objects" feature of git-pack-redundant
41159 Make git-pack-redundant take a list of unimportant objs on stdin
41161 Martin Langhoff (1):
41162 archimport: allow for old style branch and public tag names
41164 Matthias Urlichs (1):
41165 SVN import: Use one log call
41167 Nick Hengeveld (7):
41168 Isolate shared HTTP request functionality
41169 Make http-fetch request types more clear
41170 Improve pack list response handling
41171 Improve XML parsing in http-push
41172 http-push memory/fd cleanup
41173 Decide whether to build http-push in the Makefile
41177 'make clean' forgot about some files
41180 proxy-command support for git://
41182 Paul Mackerras (5):
41183 Add -r flag and some speedups
41184 gitk: Fix some bugs introduced by speedup changes
41185 gitk: Disable fastdate stuff for now
41186 gitk: Fix diff this->selected and selected->this functions
41187 gitk: Add a preferences dialog with some basic stuff
41190 git-daemon not listening when compiled with -DNO_IPV6
41191 Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.
41194 symref support for import scripts
41195 gitk: use git-diff-tree --no-commit-id
41196 gitk: UTF-8 support
41197 git-clone --shared should imply --local
41200 Fix bunch of fd leaks in http-fetch
41203 git-repack: Fix variable name
41206 Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY
41209 git-fsck-objects: Free tree entries after use
41210 Rework object refs tracking to reduce memory usage
41212 Stefan-W. Hahn (1):
41213 gitk: moving all three panes if clicking on an arrow.
41216 Fix sparse warnings
41217 Move couple of ifdefs after "include config.mk"
41219 Tommi Virtanen (1):
41220 Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".
41223 Update pull/fetch --tags documentation
41225 YOSHIFUJI Hideaki (2):
41226 GIT: Fix compilation error in connect.c
41227 Fix a warning about unused value.
41230 Fix gitk this->selected diffs
41233 documentation: clarify read-tree --reset
41234 documentation: git-tag
41237 Version v1.0rc3; changes since v1.0rc2:
41238 ---------------------------------------
41240 Junio C Hamano (1):
41241 GIT 0.99.9j aka 1.0rc3
41244 Version v1.0rc2; changes since v1.0rc1:
41245 ---------------------------------------
41248 allow git-update-ref create refs with slashes in names
41250 Andreas Ericsson (1):
41251 git-branch: Mention -d and -D in man-page.
41253 Josef Weidendorfer (2):
41254 Bugfix: stop if directory already exists
41255 Remove git-rename. git-mv does the same
41257 Junio C Hamano (5):
41258 Debian: build-depend on libexpat-dev.
41259 Rename lost+found to lost-found.
41260 Separate LDFLAGS and CFLAGS.
41261 apply: fix binary patch detection.
41262 Update topo-order test.
41265 Fix compilation warnings in pack-redundant.c
41267 Linus Torvalds (1):
41268 Fix git-rev-list "date order" with --topo-order
41270 Matthias Urlichs (3):
41271 debian packaging: git-cvs needs cvsps
41272 Remove trailing slashes
41273 Depend on asciidoc 7 (at least).
41275 Nick Hengeveld (2):
41276 Fix for multiple alternates requests in http-fetch
41277 Fix fd leak in http-fetch
41279 Nikolai Weibull (3):
41280 Document the -n command-line option to git-unpack-objects
41281 Document a couple of missing command-line options.
41282 Documentation nitpicking
41284 Thomas Matysik (2):
41285 Add expat and expat-devel dependencies (for http-push) to RPM spec.
41286 Split gitk into seperate RPM package