Version v1.7.1; changes since v1.7.1-rc1: ----------------------------------------- Charles Bailey (1): Documentation: Describe other situations where -z affects git diff Chris Webb (1): git-instaweb: pass through invoking user's path to gitweb CGI scripts Eric Raymond (1): Documentation improvements for the description of short format. Jay Soffian (1): Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 Jeff King (2): diff: use large integers for diffstat calculations rebase-interactive: silence warning when no commits rewritten Jens Lehmann (2): gitk: Add Ctrl-W shortcut for closing the active window gitk: Display dirty submodules correctly Johannes Gilger (1): pretty: Initialize notes if %N is used Johannes Sixt (2): Windows: start_command: Support non-NULL dir in struct child_process MSVC: Fix build by adding missing termios.h dummy Jonathan Nieder (6): gitk: Add comments to explain encode_view_opts and decode_view_opts gitk: Don't clobber "Remember this view" setting Add .depend directories to .gitignore Document new "already-merged" rule for branch -d tag -v: use RUN_GIT_CMD to run verify-tag Documentation/Makefile: fix interrupted builds of user-manual.xml Junio C Hamano (8): SubmittingPatches: update GMail section blame documentation: -M/-C notice copied lines as well as moved ones Git 1.7.0.5 gitweb: simplify gitweb.min.* generation and clean-up rules t3301: add tests to use --format="%N" Git 1.7.1-rc2 Git 1.7.0.6 Git 1.7.1 Marc Branchaud (1): Docs: Add -X option to git-merge's synopsis. Mark Hills (4): gitk: Remove forced use of sans-serif font gitk: Set the font for all spinbox widgets gitk: Set the font for all listbox widgets gitk: Use consistent font for all text input fields Matthew Ogilvie (1): t6006: do not write to /tmp Michael J Gruber (2): t1010-mktree: Adjust expected result to code and documentation t7012: Mark missing tests as TODO Pat Thoyts (3): gitk: Avoid calling tk_setPalette on Windows gitk: Add emacs editor variable block gitk: Fix display of copyright symbol Ramkumar Ramachandra (5): Documentation/remote-helpers: Rewrite description Documentation/urls: Rewrite to accomodate ::
Documentation/remote-helpers: Add invocation section Fixup: Second argument may be any arbitrary string Documentation/remote-helpers: Fix typos and improve language SZEDER Gábor (1): reflog: remove 'show' from 'expire's usage string Stephen Boyd (1): t3507: Make test executable Thomas Rast (1): combined diff: correctly handle truncated file Will Palmer (1): documentation: clarify direction of core.autocrlf Version v1.7.1-rc1; changes since v1.7.0.5: ------------------------------------------- Aaron Crane (1): cvsimport: new -R option: generate .git/cvs-revisions mapping Anders Kaseorg (1): everyday: fsck and gc are not everyday operations Ben Walton (2): Make templates honour SHELL_PATH and PERL_PATH Modernize git calling conventions in hook templates Benjamin C Meyer (1): Fix a spelling mistake in a git-p4 console message Bert Wesarg (4): make union merge an xdl merge favor refactor merge flags into xmparam_t merge-file: add option to specify the marker size merge-file: add option to select union merge favor Brandon Casey (10): t/t1304: avoid -d option to setfacl t/t1304: set the Default ACL base entries t/t1304: use 'test -r' to test readability rather than looking at mode bits t/t1304: set the ACL effective rights mask t/t1304: make a second colon optional in the mask ACL check notes.c: remove inappropriate call to return t5505: remove unnecessary subshell invocations t5505: add missing && t/t5505-remote.sh: escape * to prevent interpretation by shell as glob notes.h: declare bit field as unsigned to silence compiler complaints Brian Gernhardt (1): Use test_expect_success for test setups Chris Webb (1): imap-send: suppress warning about cleartext password with CRAM-MD5 Christian Couder (8): reset: add option "--keep" to "git reset" reset: add test cases for "--keep" option Documentation: reset: describe new "--keep" option reset: disallow "reset --keep" outside a work tree reset: disallow using --keep when there are unmerged entries cherry-pick: add tests for new --ff option Documentation: describe new cherry-pick --ff option rebase -i: use new --ff cherry-pick option Dave Olszewski (1): rebase--interactive: don't require what's rebased to be a branch David Aguilar (1): Makefile: Remove usage of deprecated Python "has_key" method Eric Blake (1): Makefile: update defaults for modern Cygwin Eric Raymond (1): Integrate version 3 ciabot scripts into contrib/. Erik Faye-Lund (5): hash-object: support --stdin-paths with --no-filters git-svn: support fetch with autocrlf on Revert "git-svn: always initialize with core.autocrlf=false" cherry: support --abbrev option ls: remove redundant logic Frank Li (3): fallback SSH_ASKPASS when GIT_ASKPASS not set git-svn: Support retrieving passwords with GIT_ASKPASS git-core: Support retrieving passwords with GIT_ASKPASS Hitoshi Mitake (1): imap-send: support CRAM-MD5 authentication Ian Ward Comfort (1): RPM spec: include bash completion support Ilari Liusvaara (1): Allow '+', '-' and '.' in remote helper names Jakub Narebski (2): gitweb: esc_html (short) error message in die_error gitweb: Protect escaping functions against calling on undef Jari Aalto (3): git-send-email.perl: improve error message in send_message() git-send-email.perl: add option --smtp-debug git-send-email.perl - try to give real name of the calling host to HELO/EHLO Jeff King (4): submodule summary: do not shift a non-existent positional variable fix const-correctness of write_sha1_file fix textconv leak in emit_rewrite_diff fix typos and grammar in 1.7.1 draft release notes Jens Lehmann (7): git diff --submodule: Show detailed dirty status of submodules git status: Show detailed dirty status of submodules in long format git submodule summary: Handle HEAD as argument when on an unborn branch Refactor dirty submodule detection in diff-lib.c git status: Fix false positive "new commits" output for dirty submodules git status: ignoring untracked files must apply to submodules too Teach diff --submodule and status to handle .git files in submodules Johan Herland (32): Minor cosmetic fixes to notes.c Notes API: get_commit_notes() -> format_note() + remove the commit restriction Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef Notes API: init_notes(): Initialize the notes tree from the given notes ref Notes API: add_note(): Add note objects to the internal notes tree structure Notes API: remove_note(): Remove note objects from the notes tree structure Notes API: get_note(): Return the note annotating the given object Notes API: for_each_note(): Traverse the entire notes tree with a callback Notes API: write_notes_tree(): Store the notes tree in the database Notes API: Allow multiple concurrent notes trees with new struct notes_tree Refactor notes concatenation into a flexible interface for combining notes Builtin-ify git-notes t3301: Verify successful annotation of non-commits t3305: Verify that adding many notes with git-notes triggers increased fanout Teach notes code to properly preserve non-notes in the notes tree Teach builtin-notes to remove empty notes builtin-notes: Add "remove" subcommand for removing existing notes t3305: Verify that removing notes triggers automatic fanout consolidation Notes API: prune_notes(): Prune notes that belong to non-existing objects builtin-notes: Add "prune" subcommand for removing notes for missing objects Documentation: Generalize git-notes docs to 'objects' instead of 'commits' builtin-notes: Add "list" subcommand for listing note objects builtin-notes: Add --message/--file aliases for -m/-F options builtin-notes: Add "add" subcommand for adding notes to objects builtin-notes: Add "append" subcommand for appending to note objects builtin-notes: Deprecate the -m/-F options for "git notes edit" builtin-notes: Refactor handling of -F option to allow combining -m and -F builtin-notes: Add -c/-C options for reusing notes builtin-notes: Misc. refactoring of argc and exit value handling builtin-notes: Add "copy" subcommand for copying notes between objects submodule summary: Don't barf when invoked in an empty repo builtin-notes: Minor (mostly parse_options-related) fixes Johannes Sixt (2): Print RUNTIME_PREFIX warning only when GIT_TRACE is set Windows: redirect f[re]open("/dev/null") to f[re]open("nul") Jonathan Nieder (34): Makefile: add missing header file dependencies Makefile: make sure test helpers are rebuilt when headers change Makefile: remove wt-status.h from LIB_H Makefile: clean up http-walker.o dependency rules Makefile: drop dependency on $(wildcard */*.h) Makefile: transport.o depends on branch.h now Makefile: rearrange dependency rules Makefile: disable default implicit rules Makefile: list generated object files in OBJECTS Makefile: lazily compute header dependencies Makefile: list standalone program object files in PROGRAM_OBJS Teach Makefile to check header dependencies Do not install shell libraries executable Makefile: tuck away generated makefile fragments in .depend Makefile: always remove .depend directories on 'make clean' Makefile: clarify definition of TEST_OBJS Makefile: Fix occasional GIT-CFLAGS breakage revert: fix tiny memory leak in cherry-pick --ff tests: document format of conflicts from checkout -m tests: document cherry-pick behavior in face of conflicts xdl_merge(): add optional ancestor label to diff3-style output xdl_merge(): move file1 and file2 labels to xmparam structure merge-file --diff3: add a label for ancestor ll_merge(): add ancestor label parameter for diff3-style output checkout --conflict=diff3: add a label for ancestor merge_file(): add comment explaining behavior wrt conflict style merge_trees(): add ancestor label parameter for diff3-style output checkout -m --conflict=diff3: add a label for ancestor compat: add mempcpy() revert: clarify label on conflict hunks cherry-pick, revert: add a label for ancestor merge-recursive: add a label for ancestor Makefile: future-proof Cygwin version check Teach mailinfo %< as an alternative scissors mark Junio C Hamano (27): builtin-for-each-ref.c: comment fixes builtin-for-each-ref.c: check if we need to peel onion while parsing the format for-each-ref --format='%(symref) %(symref:short)' for-each-ref --format='%(flag)' Start 1.7.1 cycle Resurrect "git grep --no-index" Update draft release notes to 1.7.1 notes: fix malformed tree entry wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR submodule summary: do not fail before the first commit parse-options: add parse_options_concat() to concat options builtin/merge: make checkout_fast_forward() non static revert: add --ff option to allow fast forward when cherry-picking Update draft release notes to 1.7.1 Documentation: improve description of "git reset --keep" t4013: add tests for log -p -m --first-parent revision: introduce setup_revision_opt show -c: show patch text show --first-parent/-m: do not default to --cc Makefile: update check-docs target t5516: Use test_cmp when appropriate Update draft release notes to 1.7.1 Update draft release notes to 1.7.1 Revert "Link against libiconv on IRIX" Git 1.7.1-rc0 diff.c: work around pointer constness warnings Git 1.7.1-rc1 Larry D'Anna (4): git-push: fix an advice message so it goes to stderr git-push: send "To " messages to the standard output in --porcelain mode git-push: make git push --porcelain print "Done" git-push: add tests for git push --porcelain Linus Torvalds (1): Move 'builtin-*' into a 'builtin/' subdirectory Marc Branchaud (1): Teach rebase the --no-ff option. Mark Lodato (4): Add an optional argument for --color options Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_* grep: Colorize filename, line number, and separator grep: Colorize selected, context, and function lines Mark Rada (6): Gitweb: add ignore and clean rules for minified files Gitweb: add support for minifying gitweb.css Gitweb: add autoconfigure support for minifiers instaweb: add minification awareness gitweb: add documentation to INSTALL regarding gitweb.js gitweb: update INSTALL to use shorter make target Markus Heidelberg (2): builtin/commit: fix duplicated sentence in a comment builtin/commit: remove unnecessary variable definition Michael J Gruber (7): git-svn: req_svn when needed t9119-git-svn-info.sh: test with svn 1.6.* as well Documentation: fix a few typos in git-notes.txt git-svn: make git svn --version work again rev-list: use default abbrev length when abbrev-commit is in effect t3301-notes: Test the creation of reflog entries refs.c: Write reflogs for notes just like for branch heads Michael Lukashov (4): connect.c: move duplicated code to a new function 'get_host_and_port' refactor duplicated code in builtin-send-pack.c and transport.c refactor duplicated fill_mm() in checkout and merge-recursive refactor duplicated encode_header in pack-objects and fast-import Michele Ballabio (1): shortlog: warn the user when there is no input Miklos Vajna (1): request-pull: avoid mentioning that the start point is a single commit Nguyễn Thái Ngọc Duy (5): make_absolute_path(): Do not append redundant slash init-db, rev-parse --git-dir: do not append redundant slash Move offset_1st_component() to path.c Support working directory located at root Add test for using Git at root of file system Nicolas Pitre (1): move encode_in_pack_object_header() to a better place Petr Baudis (1): git log -p -m: document -m and honor --first-parent René Scharfe (2): setenv(GIT_DIR) clean-up grep: enable threading for context line printing SZEDER Gábor (4): bash: improve aliased command recognition bash: support user-supplied completion scripts for user's git commands bash: support user-supplied completion scripts for aliases bash: completion for gitk aliases Stefan-W. Hahn (4): documentation: 'git-mailsplit --keep-cr' is not hidden anymore git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit git-am: Add am.keepcr and --no-keep-cr to override it git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` Stephen Boyd (11): format-patch: use a string_list for headers format-patch: add --no-cc, --no-to, and --no-add-headers send-email: add --no-cc, --no-to, and --no-bcc notes: rework subcommands and parse options fmt-merge-msg: be quiet if nothing to merge t6200: modernize with test_tick t6200: test fmt-merge-msg more fmt-merge-msg: use pretty.c routines string-list: add unsorted_string_list_lookup() fmt-merge-msg: remove custom string_list implementation fmt-merge-msg: hide summary option Steven Drake (5): Add `init.templatedir` configuration variable. Add a "TEMPLATE DIRECTORY" section to git-init[1]. init: having keywords without value is not a global error. t/t0001-init.sh: add test for 'init with init.templatedir set' Add 'git format-patch --to=' option and 'format.to' configuration variable. Tay Ray Chuan (17): Documentation/git-clone: mention progress in -v Documentation/git-pull: put verbosity options before merge/fetch ones Documentation/git-push: put --quiet before --verbose fetch: refactor verbosity option handling into transport.[ch] push: support multiple levels of verbosity clone: support multiple levels of verbosity transport->progress: use flag authoritatively push: learn --progress fetch and pull: learn --progress transport: update flags to be in running order t5541-http-push: check that ref is unchanged for non-ff test t554[01]-http-push: refactor, add non-ff tests http-push: remove "|| 1" to enable verbose check http-walker: cleanup more thoroughly http: init and cleanup separately from http-walker remote-curl: use http_fetch_ref() instead of walker wrapper remote-curl: init walker only when needed Thomas Rast (14): test-lib: unset GIT_NOTES_REF to stop it from influencing tests Support showing notes from more than one notes tree Documentation: document post-rewrite hook commit --amend: invoke post-rewrite hook rebase: invoke post-rewrite hook rebase -i: invoke post-rewrite hook notes: implement 'git notes copy --stdin' notes: implement helpers needed for note copying during rewrite rebase: support automatic notes copying commit --amend: copy notes to the new commit notes: add shorthand --ref to override GIT_NOTES_REF notes: track whether notes_trees were changed at all git-notes(1): add a section about the meaning of history rebase -i: make post-rewrite work for 'edit' Tuomas Suutari (5): t9151: Fix a few commits in the SVN dump t9151: Add two new svn:mergeinfo test cases git-svn: Fix discarding of extra parents from svn:mergeinfo git-svn: Fix merge detecting with rewrite-root t9150,t9151: Add rewrite-root option to init YONETANI Tomokazu (1): Fix _XOPEN_SOURCE problem on DragonFly josh robb (1): git svn: delay importing SVN::Base until it is needed Version v1.7.0.5; changes since v1.7.0.4: ----------------------------------------- Brandon Casey (1): daemon.c: avoid accessing ss_family member of struct sockaddr_storage Erik Faye-Lund (1): rev-list: fix --pretty=oneline with empty message Gustaf Hendeby (1): Improve error messages from 'git stash show' Jeff King (1): docs: clarify "branch -l" Jens Lehmann (1): Let check_preimage() use memset() to initialize "struct checkout" Junio C Hamano (3): diff --check: honor conflict-marker-size attribute blame documentation: -M/-C notice copied lines as well as moved ones Git 1.7.0.5 Michael J Gruber (2): .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela send-email: lazily assign editor variable R. Tyler Ballance (1): Correct references to /usr/bin/python which does not exist on FreeBSD Ramkumar Ramachandra (1): imap-send: Remove limitation on message body Shawn O. Pearce (1): http-backend: Don't infinite loop during die() Tay Ray Chuan (4): pack-protocol.txt: fix spelling pack-protocol.txt: fix pkt-line lengths branch: say "Reset to" in reflog entries for 'git branch -f' operations fetch/push: fix usage strings Version v1.7.0.4; changes since v1.7.0.3: ----------------------------------------- Björn Gustavsson (5): apply: Don't unnecessarily update line lengths in the preimage apply: Remove the quick rejection test apply: Allow blank context lines to match beyond EOF t4124: Add additional tests of --whitespace=fix t3417: Add test cases for "rebase --whitespace=fix" Chris Packham (1): test for add with non-existent pathspec David Aguilar (1): difftool: Fix '--gui' when diff.guitool is unconfigured Greg Bacon (1): Documentation: Clarify support for smart HTTP backend Holger Weiß (3): Don't redefine htonl and ntohl on big-endian Link against libiconv on IRIX Documentation: show-ref s are optional Jakub Narebski (1): gitweb: git_get_project_config requires only $git_dir, not also $project Jan Stępień (1): Updated the usage string of git reset Jeff King (1): dir: fix COLLECT_IGNORED on excluded prefixes Johannes Sixt (2): diff: fix textconv error zombies Windows: fix utime() for read-only files Junio C Hamano (8): git add -u: die on unmatched pathspec color: allow multiple attributes t0050: mark non-working test as such tests for "git add ignored-dir/file" without -f refs: ref entry with NULL sha1 is can be a dangling symref t9350: fix careless use of "cd" Prepare for 1.7.0.4 Git 1.7.0.4 Kevin Ballard (1): format-patch: Squelch 'fatal: Not a range." error Markus Heidelberg (1): Documentation: explain the meaning of "-g" in git-describe output Sverre Rabbelier (1): fast-export: don't segfault when marks file cannot be opened Version v1.7.0.3; changes since v1.7.0.2: ----------------------------------------- Adam Simpkins (2): prune: honor --expire=never reflog: honor gc.reflogexpire=never Andreas Gruenbacher (3): fetch: Check for a "^{}" suffix with suffixcmp() fetch: Future-proof initialization of a refspec on stack fetch: Fix minor memory leak Dave Olszewski (1): don't use default revision if a rev was specified Filippo Negroni (1): Fix gitmkdtemp: correct test for mktemp() return value Giuseppe Bilotta (5): Refactor list of of repo-local env vars rev-parse: --local-env-vars option shell setup: clear_local_git_env() function submodules: ensure clean environment when operating in a submodule is_submodule_modified(): clear environment properly Ian Ward Comfort (1): bash: complete *_HEAD refs if present Imre Deak (1): daemon: parse_host_and_port SIGSEGV if port is specified Jeff King (2): add-interactive: fix bogus diff header line ordering push: fix segfault for odd config Jonathan Nieder (1): Makefile: Fix CDPATH problem Junio C Hamano (12): "log --author=me --grep=it" should find intersection, not union Reword "detached HEAD" notification mailinfo: do not strip leading spaces even for a header line t5521: fix and modernize builtin-fetch --all/--multi: propagate options correctly fetch --all/--multiple: keep all the fetched branch information pack-objects documentation: reword "objects that appear in the standard input" Merge accumulated fixes to prepare for 1.7.0.3 t9400: Use test_cmp when appropriate t/Makefile: remove test artifacts upon "make clean" Update draft release notes to 1.7.0.3 Git 1.7.0.3 Mark Lodato (4): grep docs: pluralize "Example" section grep docs: use AsciiDoc literals consistently grep docs: --cached and ... are incompatible grep docs: document --no-index option Matthieu Moy (6): Add a testcase for ACL with restrictive umask. Move gitmkstemps to path.c git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. git_mkstemps_mode: don't set errno to EINVAL on exit. Use git_mkstemp_mode instead of plain mkstemp to create object files Michael J Gruber (7): Documentation/git-read-tree: fix table layout Documentation/git-read-tree: clarify 2-tree merge Documentation/git-reflog: Fix formatting of command lists Documentation/gitdiffcore: Remove misleading date in heading Documentation/urls: Remove spurious example markers Documentation/git-clone: Transform description list into item list .mailmap: Map the the first submissions of MJG by e-mail Michael Wookey (1): run-command.c: fix build warnings on Ubuntu Nelson Elhage (2): Documentation: pack-objects: Clarify --local's semantics. pack-objects documentation: Fix --honor-pack-keep as well. René Scharfe (2): blame: fix indent of line numbers for_each_recent_reflog_ent(): use strbuf, fix offset handling Stephen Boyd (1): pull: replace unnecessary sed invocation Thomas Rast (1): Documentation: receive.denyCurrentBranch defaults to 'refuse' Version v1.7.0.2; changes since v1.7.0: --------------------------------------- Bert Wesarg (3): Documentation: mention conflict marker size argument (%L) for merge driver rerere: fix memory leak if rerere images can't be read unset GREP_OPTIONS in test-lib.sh Christian Couder (1): bisect: error out when passing bad path parameters Dmitry Potapov (1): hash-object: don't use mmap() for small files Erik Faye-Lund (1): run-command: support custom fd-set in async Evan Powers (1): git-p4: fix bug in symlink handling Gabriel Filion (1): require_work_tree broken with NONGIT_OK Hitoshi Mitake (1): git-imap-send: Convert LF to CRLF before storing patch to draft box Jacob Helwig (1): Documentation: Fix indentation problem in git-commit(1) Jakub Narebski (2): gitweb: Die if there are parsing errors in config file gitweb: Fix project-specific feature override behavior Jeff King (9): accept "git grep -- pattern" cherry-pick: rewrap advice message cherry-pick: refactor commit parsing code cherry-pick: format help message as strbuf cherry-pick: show commit name instead of sha1 cherry-pick: prettify the advice message dwim_ref: fix dangling symref warning docs: don't talk about $GIT_DIR/refs/ everywhere rm: fix bug in recursive subdirectory removal Johannes Sixt (1): t3301-notes: insert a shbang line in ./fake_editor.sh Jonathan Nieder (9): Fix 'git var' usage synopsis Make 'git var GIT_PAGER' always print the configured pager git.1: Clarify the behavior of the --paginate option git svn: Fix launching of pager am: Fix launching of pager tests: Add tests for automatic use of pager t7006-pager: if stdout is not a terminal, make a new one tests: Fix race condition in t7006-pager am: remove rebase-apply directory before gc Junio C Hamano (12): t6000lib: Fix permission lib-patch-mode.sh: Fix permission Typofixes outside documentation area Start 1.7.0 maintenance track Fix use of mutex in threaded grep Prepare 1.7.0.1 release notes status: preload index to optimize lstat(2) calls Update 1.7.0.1 release notes Git 1.7.0.1 Start preparing for 1.7.0.2 Update draft release notes to 1.7.0.2 Git 1.7.0.2 Larry D'Anna (3): diff: make sure --output=/bad/path is caught git diff --quiet -w: check and report the status git-diff: add a test for git diff --quiet -w Mark Lodato (2): grep documentation: clarify what files match Remove reference to GREP_COLORS from documentation Markus Heidelberg (1): sha1_name: fix segfault caused by invalid index access Matt Kraai (1): commit: quote the user name in the example Matthieu Moy (1): stash: suggest the correct command line for unknown options. Michal Sojka (1): Remove extra '-' from git-am(1) Nicolas Pitre (8): fast-import: start using struct pack_idx_entry fast-import: use sha1write() for pack data fast-import: use write_idx_file() instead of custom code fast-import: make default pack size unlimited fast-import: honor pack.indexversion and pack.packsizelimit config vars fast-import: use the diff_delta() max_delta_size argument sha1_file: don't malloc the whole compressed result when writing out objects sha1_file: be paranoid when creating loose objects Pete Harlan (1): Remove hyphen from "git-command" in two error messages René Scharfe (5): fix minor memory leak in get_tree_entry() utf8.c: remove print_wrapped_text() utf8.c: remove print_spaces() utf8.c: remove strbuf_write() utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() Shawn O. Pearce (7): run-command: Allow stderr to be a caller supplied pipe send-pack: demultiplex a sideband stream with status data receive-pack: Refactor how capabilities are shown to the client receive-pack: Wrap status reports inside side-band-64k receive-pack: Send hook output over side band #2 t5401: Use a bare repository for the remote peer receive-pack: Send internal errors over side-band #2 Stephen Boyd (2): Documentation: describe --thin more accurately t7406: Fix submodule init config tests Sylvain Rabot (1): gitweb multiple project roots documentation Tay Ray Chuan (1): transport: add got_remote_refs flag Thomas Rast (3): stash pop: remove 'apply' options during 'drop' invocation t1450: fix testcases that were wrongly expecting failure cherry_pick_list: quit early if one side is empty Version v1.7.0; changes since v1.7.0-rc2: ----------------------------------------- Brian Gernhardt (1): t3902: Protect against OS X normalization Jacob Helwig (1): filter-branch: Fix error message for --prune-empty --commit-filter Jay Soffian (1): blame: prevent a segv when -L given start > EOF Jeff King (1): am: switch --resolved to --continue Junio C Hamano (11): git-add documentation: Fix shell quoting example Fix parsing of imap.preformattedHTML and imap.sslverify git-push: document all the status flags used in the output check-ref-format documentation: fix enumeration mark-up t8003: check exit code of command and error message separately Git 1.6.6.2 Update draft release notes to 1.7.0 one more time archive documentation: attributes are taken from the tree by default Re-fix check-ref-format documentation mark-up Fix typo in 1.6.6.2 release notes Git 1.7.0 Michael J Gruber (1): Documentation: minor fixes to RelNotes-1.7.0 Nicolas Pitre (1): Revert "pack-objects: fix pack generation when using pack_size_limit" SZEDER Gábor (1): bash: support 'git am's new '--continue' option Thomas Rast (1): Documentation: quote braces in {upstream} notation Version v1.7.0-rc2; changes since v1.7.0-rc1: --------------------------------------------- Andrew Myrick (1): git-svn: persistent memoization Ben Walton (2): configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM configure: Allow --without-python Björn Gustavsson (1): bash: support the --autosquash option for rebase Brian Gernhardt (2): t9501: Skip testing load if we can't detect it t9501: Re-fix max load test Christian Stimming (1): git-gui: Update German translation (12 new or changed strings). Dan McGee (1): Make NO_PTHREADS the sole thread configuration variable Emmanuel Trillaud (1): git-gui: update french translation Giuseppe Bilotta (4): git-gui: handle non-standard worktree locations git-gui: handle bare repos correctly git-gui: update shortcut tools to use _gitworktree git-gui: set GIT_DIR and GIT_WORK_TREE after setup Heiko Voigt (1): git-gui: fix shortcut for menu "Commit/Revert Changes" Jakub Narebski (1): gitweb: Make running t9501 test with '--debug' reliable and usable Jeff Epler (1): git-gui: Support applying a range of changes at once Jeff King (3): mention new shell execution behavior in release notes docs: fix filter-branch example for quoted paths Fix invalid read in quote_c_style_counted Jens Lehmann (5): git-gui: Use git diff --submodule when available git-gui: Add a special diff popup menu for submodules git-gui: Quote git path when starting another gui in a submodule Fix memory leak in submodule.c Updates for dirty submodules in release notes and user manual John 'Warthog9' Hawley (7): gitweb: Load checking gitweb: Makefile improvements gitweb: Check that $site_header etc. are defined before using them gitweb: add a "string" variant of print_local_time gitweb: add a "string" variant of print_sort_th gitweb: Add optional extra parameter to die_error, for extended explanation gitweb: Simplify (and fix) chop_str Junio C Hamano (7): RPM packaging: use %global inside %{!?...} Update draft release notes to 1.7.0 build: make code "-Wpointer-arith" clean fast-import.c: Fix big-file-threshold parsing bug fast-import: count --max-pack-size in bytes Revert 30816237 and 7e62265 Update draft release notes to 1.7.0 Michael J Gruber (1): git-clean: fix the description of the default behavior Michal Sojka (2): filter-branch: Fix to allow replacing submodules with another content filter-branch: Add tests for submodules in tree-filter Michele Ballabio (1): git-gui: update Italian translation Nanako Shiraishi (1): git-gui: update Japanese translation Nicolas Pitre (4): fix multiple issues with t5300 pack-objects: fix pack generation when using pack_size_limit make --max-pack-size argument to 'git pack-object' count in bytes update git-repack documentation wrt repack.UseDeltaBaseOffset Pal-Kristian Engstad (1): git-p4: Fix sync errors due to new server version Pat Thoyts (1): git-gui: use themed tk widgets with Tk 8.5 Paul Mackerras (1): gitk: Fix copyright symbol in About box message Peter Krefting (1): git-gui: Update Swedish translation (520t0f0u) Peter Oberndorfer (1): git-gui: use different icon for new and modified files in the index Ralf Wildenhues (1): Fix typos in technical documentation. René Scharfe (2): grep: simplify assignment of ->fixed archive: simplify archive format guessing Shawn O. Pearce (4): git-gui: Remove unused icon file_parttick git-gui: Update translation template fast-import: Stream very large blobs directly to pack Correct spelling of 'REUC' extension Wesley J. Landaker (1): Update git fsck --full short description to mention packs Version v1.7.0-rc1; changes since v1.6.6.2: ------------------------------------------- Alejandro Riveira Fernández (1): Add test-run-command to .gitignore Andreas Gruenbacher (2): builtin-apply.c: Skip filenames without enough components builtin-apply.c: fix the --- and +++ header filename consistency check Andrew Myrick (3): git-svn: ignore changeless commits when checking for a cherry-pick git-svn: handle merge-base failures git-svn: update svn mergeinfo test suite Andrzej K. Haczewski (1): MSVC: Windows-native implementation for subset of Pthreads API Avery Pennarun (3): git merge -X