From 648d4febcb94fe252ef8d44cf5acb3f913cfd83a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 3 May 2011 22:18:46 -0700 Subject: [PATCH] Really retire whats/in Since ee21229 (Merge in "What's cooking" history, 2010-01-04) hinted that "What's in" is merely a glorified "shortlog --no-merges", I haven't issued a new issue. The regular "What's cooking" message lists them in a much more readable way in its "Graduated to master" section. --- whats/in/2008/06/01.txt | 88 ---------- whats/in/2008/06/02.txt | 43 ----- whats/in/2008/06/03.txt | 65 ------- whats/in/2008/06/04.txt | 42 ----- whats/in/2008/07/01.txt | 301 ------------------------------- whats/in/2008/07/02.txt | 126 ------------- whats/in/2008/07/03.txt | 81 --------- whats/in/2008/07/04.txt | 111 ------------ whats/in/2008/07/05.txt | 117 ------------ whats/in/2008/07/06.txt | 90 ---------- whats/in/2008/07/07.txt | 51 ------ whats/in/2008/07/08.txt | 119 ------------- whats/in/2008/07/09.txt | 119 ------------- whats/in/2008/08/01.txt | 131 -------------- whats/in/2008/08/02.txt | 124 ------------- whats/in/2008/08/03.txt | 67 ------- whats/in/2008/08/04.txt | 22 --- whats/in/2008/08/05.txt | 92 ---------- whats/in/2008/08/06.txt | 124 ------------- whats/in/2008/08/07.txt | 107 ----------- whats/in/2008/09/01.txt | 237 ------------------------- whats/in/2008/09/02.txt | 94 ---------- whats/in/2008/09/03.txt | 138 --------------- whats/in/2008/09/04.txt | 178 ------------------- whats/in/2008/10/01.txt | 114 ------------ whats/in/2008/10/02.txt | 128 -------------- whats/in/2008/10/03.txt | 31 ---- whats/in/2008/10/04.txt | 78 -------- whats/in/2008/10/05.txt | 131 -------------- whats/in/2008/11/01.txt | 130 -------------- whats/in/2008/11/02.txt | 172 ------------------ whats/in/2008/11/03.txt | 164 ----------------- whats/in/2008/11/04.txt | 121 ------------- whats/in/2008/12/01.txt | 161 ----------------- whats/in/2008/12/02.txt | 146 --------------- whats/in/2008/12/03.txt | 126 ------------- whats/in/2008/12/04.txt | 64 ------- whats/in/2009/01/01.txt | 168 ------------------ whats/in/2009/01/02.txt | 132 -------------- whats/in/2009/01/03.txt | 133 -------------- whats/in/2009/01/04.txt | 125 ------------- whats/in/2009/02/01.txt | 146 --------------- whats/in/2009/02/02.txt | 121 ------------- whats/in/2009/02/03.txt | 85 --------- whats/in/2009/03/01.txt | 152 ---------------- whats/in/2009/03/02.txt | 49 ------ whats/in/2009/03/03.txt | 101 ----------- whats/in/2009/03/04.txt | 150 ---------------- whats/in/2009/03/05.txt | 134 -------------- whats/in/2009/03/06.txt | 381 ---------------------------------------- whats/in/2009/04/01.txt | 228 ------------------------ whats/in/2009/04/02.txt | 282 ----------------------------- whats/in/2009/05/01.txt | 42 ----- whats/in/2009/05/02.txt | 218 ----------------------- whats/in/2009/05/03.txt | 159 ----------------- whats/in/2009/06/01.txt | 207 ---------------------- whats/in/2009/06/02.txt | 93 ---------- whats/in/2009/07/01.txt | 295 ------------------------------- whats/in/2009/07/02.txt | 45 ----- whats/in/2009/08/01.txt | 92 ---------- whats/in/2010/02/01.txt | 78 -------- 61 files changed, 7849 deletions(-) delete mode 100644 whats/in/2008/06/01.txt delete mode 100644 whats/in/2008/06/02.txt delete mode 100644 whats/in/2008/06/03.txt delete mode 100644 whats/in/2008/06/04.txt delete mode 100644 whats/in/2008/07/01.txt delete mode 100644 whats/in/2008/07/02.txt delete mode 100644 whats/in/2008/07/03.txt delete mode 100644 whats/in/2008/07/04.txt delete mode 100644 whats/in/2008/07/05.txt delete mode 100644 whats/in/2008/07/06.txt delete mode 100644 whats/in/2008/07/07.txt delete mode 100644 whats/in/2008/07/08.txt delete mode 100644 whats/in/2008/07/09.txt delete mode 100644 whats/in/2008/08/01.txt delete mode 100644 whats/in/2008/08/02.txt delete mode 100644 whats/in/2008/08/03.txt delete mode 100644 whats/in/2008/08/04.txt delete mode 100644 whats/in/2008/08/05.txt delete mode 100644 whats/in/2008/08/06.txt delete mode 100644 whats/in/2008/08/07.txt delete mode 100644 whats/in/2008/09/01.txt delete mode 100644 whats/in/2008/09/02.txt delete mode 100644 whats/in/2008/09/03.txt delete mode 100644 whats/in/2008/09/04.txt delete mode 100644 whats/in/2008/10/01.txt delete mode 100644 whats/in/2008/10/02.txt delete mode 100644 whats/in/2008/10/03.txt delete mode 100644 whats/in/2008/10/04.txt delete mode 100644 whats/in/2008/10/05.txt delete mode 100644 whats/in/2008/11/01.txt delete mode 100644 whats/in/2008/11/02.txt delete mode 100644 whats/in/2008/11/03.txt delete mode 100644 whats/in/2008/11/04.txt delete mode 100644 whats/in/2008/12/01.txt delete mode 100644 whats/in/2008/12/02.txt delete mode 100644 whats/in/2008/12/03.txt delete mode 100644 whats/in/2008/12/04.txt delete mode 100644 whats/in/2009/01/01.txt delete mode 100644 whats/in/2009/01/02.txt delete mode 100644 whats/in/2009/01/03.txt delete mode 100644 whats/in/2009/01/04.txt delete mode 100644 whats/in/2009/02/01.txt delete mode 100644 whats/in/2009/02/02.txt delete mode 100644 whats/in/2009/02/03.txt delete mode 100644 whats/in/2009/03/01.txt delete mode 100644 whats/in/2009/03/02.txt delete mode 100644 whats/in/2009/03/03.txt delete mode 100644 whats/in/2009/03/04.txt delete mode 100644 whats/in/2009/03/05.txt delete mode 100644 whats/in/2009/03/06.txt delete mode 100644 whats/in/2009/04/01.txt delete mode 100644 whats/in/2009/04/02.txt delete mode 100644 whats/in/2009/05/01.txt delete mode 100644 whats/in/2009/05/02.txt delete mode 100644 whats/in/2009/05/03.txt delete mode 100644 whats/in/2009/06/01.txt delete mode 100644 whats/in/2009/06/02.txt delete mode 100644 whats/in/2009/07/01.txt delete mode 100644 whats/in/2009/07/02.txt delete mode 100644 whats/in/2009/08/01.txt delete mode 100644 whats/in/2010/02/01.txt diff --git a/whats/in/2008/06/01.txt b/whats/in/2008/06/01.txt deleted file mode 100644 index aa28622e76..0000000000 --- a/whats/in/2008/06/01.txt +++ /dev/null @@ -1,88 +0,0 @@ -What's in git.git (Jun 2008, issue #01; Wed, 18) - - maint 4afbcab (diff.c: fix emit_line() again not to add extra line, 2008-06-16) - master 8c6b578 (Fix approxidate("never") to always return 0, 2008-06-17) ------------------------------------------------------------------------- - -I am sending this out just as the final minute preview before 1.5.6 final, -hopefully tomorrow night. - -* The 'maint' branch has these fixes since the last announcement. - -Junio C Hamano (1): - diff.c: fix emit_line() again not to add extra line - -SZEDER Gábor (1): - diff: reset color before printing newline - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Alejandro Mery (1): - git-am: head -1 is obsolete and doesn't work on some new systems - -Avery Pennarun (2): - git-svn: don't append extra newlines at the end of commit messages. - git-svn: test that extra blank lines aren't inserted in commit messages. - -Christian Couder (2): - documentation: bisect: remove bits talking about a bisection branch - Documentation: RelNotes-1.5.6: talk about renamed HTML files - -Flavio Poletti (1): - git-instaweb: improve auto-discovery of httpd and call conventions. - -Jakub Narebski (2): - gitweb: Make it work with $GIT containing spaces - Use 'trash directory' thoroughly in t/test-lib.sh - -Johan Herland (3): - cpio is no longer used by git-clone - Consistency: Use "libcurl" instead of "cURL library" and "curl" - The "curl" executable is no longer required - -Junio C Hamano (8): - t4126: fix test that happened to work due to timing - sha1_file.c: dead code removal - GIT 1.5.6-rc3 - Makefile: update check-docs target - Update RPM spec to drop curl executable requirement - create_tempfile: make sure that leading directories can be accessible by - peers - sha1_file.c: simplify parse_pack_index() - builtin-rerere: fix a small leak - -Lea Wiemann (2): - gitweb: quote commands properly when calling the shell - gitweb: remove unused parse_ref method - -Linus Torvalds (4): - Avoid cross-directory renames and linking on object creation - Make loose object file reading more careful - Simplify and rename find_sha1_file() - write_loose_object: don't bother trying to read an old object - -Mark Levedahl (1): - git-submodule - Fix errors regarding resolve_relative_url - -Mike Hommey (1): - Don't allocate too much memory in quote_ref_url - -Miklos Vajna (2): - run-command documentation: fix "memset()" parameter - path-list documentation: document all functions and data structures - -Olivier Marin (1): - Fix approxidate("never") to always return 0 - -Pierre Habouzit (1): - Make git reflog expire honour core.sharedRepository. - -René Scharfe (1): - Ignore .gitattributes in bare repositories - -SZEDER Gábor (2): - git add: add long equivalents of '-u' and '-f' options - completion: add more 'git add' options - diff --git a/whats/in/2008/06/02.txt b/whats/in/2008/06/02.txt deleted file mode 100644 index 24d88fa159..0000000000 --- a/whats/in/2008/06/02.txt +++ /dev/null @@ -1,43 +0,0 @@ -What's in git.git (Jun 2008, issue #02; Sat, 21) - - maint 3b2bbe9 (Documentation: fix formatting in git-svn, 2008-06-20) - master 73f0362 (Correct documentation for git-push --mirror, 2008-06-20) ------------------------------------------------------------------------- - -* The 'maint' branch has now preparing for 1.5.6.1, with these noncritical - fixes. - -Brandon Casey (2): - git-merge.sh: fix typo in usage message: sucesses --> succeeds - t7502-commit.sh: test_must_fail doesn't work with inline environment - variables - -Dan McGee (1): - completion: add --graph to log command completion - -Jan Krüger (1): - Documentation: fix formatting in git-svn - - -* The 'master' branch has these since the last announcement - in addition to the above. Not much to see here (yet). - -Cristian Peraferrer (1): - Print errno upon failure to open the COMMIT_EDITMSG file - -Jakub Narebski (1): - t/README: Add 'Skipping Tests' section below 'Running Tests' - -Lea Wiemann (1): - test-lib.sh: add --long-tests option - -Lukas Sandström (1): - Add a helper script to send patches with Mozilla Thunderbird - -Shawn O. Pearce (1): - Correct documentation for git-push --mirror - -Teemu Likonen (2): - bash: Add more option completions for 'git log' - Add target "install-html" the the top level Makefile - diff --git a/whats/in/2008/06/03.txt b/whats/in/2008/06/03.txt deleted file mode 100644 index 6cc28fa3c5..0000000000 --- a/whats/in/2008/06/03.txt +++ /dev/null @@ -1,65 +0,0 @@ -What's in git.git (Jun 2008, issue #03; Mon, 23) - - maint 010a2da (Extend parse-options test suite, 2008-06-22) - master 112db55 (Shrink the git binary a bit by avoiding unnecessary inline functions, 2008-06-22) ------------------------------------------------------------------------- - -There are a few more fixes destined for maint, being tested in next first. - -* The 'maint' branch has these fixes since the last announcement. - -Michele Ballabio (1): - parse-options.c: fix documentation syntax of optional arguments - -Stephan Beyer (3): - api-builtin.txt: update and fix typo - api-parse-options.txt: Introduce documentation for parse options API - Extend parse-options test suite - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Jakub Narebski (2): - gitweb: Separate filling list of projects info - gitweb: Separate generating 'sort by' table header - -Jeff King (5): - fix whitespace violations in test scripts - mask necessary whitespace policy violations in test scripts - avoid whitespace on empty line in automatic usage message - avoid trailing whitespace in zero-change diffstat lines - enable whitespace checking of test scripts - -Junio C Hamano (1): - diff -c/--cc: do not include uninteresting deletion before leading - context - -Karl Hasselström (2): - Clean up builtin-update-ref's option parsing - Make old sha1 optional with git update-ref -d - -Linus Torvalds (3): - racy-git: an empty blob has a fixed object name - Make git_dir a path relative to work_tree in setup_work_tree() - Shrink the git binary a bit by avoiding unnecessary inline functions - -Marius Storm-Olsen (3): - Add an optional argument to commit/status -u|--untracked-files - option - Add argument 'no' commit/status option -u|--untracked-files - Add configuration option for default untracked files mode - -Nanako Shiraishi (2): - environment.c: remove unused function - config.c: make git_env_bool() static - -Pieter de Bie (1): - builtin-fast-export: Add importing and exporting of revision marks - -Rafael Garcia-Suarez (1): - gitweb: remove git_blame and rename git_blame2 to git_blame - -René Scharfe (1): - Teach new attribute 'export-ignore' to git-archive - diff --git a/whats/in/2008/06/04.txt b/whats/in/2008/06/04.txt deleted file mode 100644 index 8395f2e96e..0000000000 --- a/whats/in/2008/06/04.txt +++ /dev/null @@ -1,42 +0,0 @@ -What's in git.git (Jun 2008, issue #04; Wed, 25) - - maint 74b1e12 (git-svn: make rebuild respect rewriteRoot option, 2008-06-24) - master 85fe23e (verify-pack: test for detection of index v2 object CRC mismatch, 2008-06-24) ------------------------------------------------------------------------- - -We'd need a maint release soon to push out the mkstemp() breakage but not -tonight. There are a handful changes that are in 'master' and 'next' that -need backport/backmerge before 1.5.6.1 happens. - -* The 'maint' branch has these fixes since the last announcement. - -Jan Krüger (1): - git-svn: make rebuild respect rewriteRoot option - -Patrick Higgins (1): - Workaround for AIX mkstemp() - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Jeff King (1): - clone: create intermediate directories of destination repo - -Junio C Hamano (2): - pre-rebase hook update - Ship sample hooks with .sample suffix - -Michele Ballabio (1): - t9301-fast-export.sh: Remove debug line - -Nicolas Pitre (8): - call init_pack_revindex() lazily - implement some resilience against pack corruptions - test case for pack resilience against corruptions - refactor pack structure allocation - optimize verify-pack a bit - move show_pack_info() where it belongs - verify-pack: check packed object CRC when using index version 2 - verify-pack: test for detection of index v2 object CRC mismatch - diff --git a/whats/in/2008/07/01.txt b/whats/in/2008/07/01.txt deleted file mode 100644 index 7d5e7f6cac..0000000000 --- a/whats/in/2008/07/01.txt +++ /dev/null @@ -1,301 +0,0 @@ -What's in git.git (Jul 2008, issue #01; Tue, 01) - - maint 7ad0f27 (Start draft release notes for 1.5.6.2, 2008-07-01) - master e903b40 (Update draft release notes for 1.6.0, 2008-07-01) ------------------------------------------------------------------------- - -There are a few fixes on 'maint', in addition to futureproofing of "git -shell" so that eventually we can update the ssh clients to ask for server -side programs using "git upload-pack" syntax without a dash between "git" -and the subcommand name. - -Many of the medimu size items for 1.6.0 have been merged to 'master'. The -port to MinGW series will also be merged shortly. - ----------------------------------------------------------------- - -GIT v1.6.0 Release Notes (draft) -================================ - -User visible changes --------------------- - -With the default Makefile settings, most of the programs are now -installed outside your $PATH, except for "git", "gitk", "git-gui" and -some server side programs that need to be accessible for technical -reasons. Invoking a git subcommand as "git-xyzzy" from the command -line has been deprecated since early 2006 (and officially announced in -1.5.4 release notes); use of them from your scripts after adding -output from "git --exec-path" to the $PATH is still supported in this -release, but users are again strongly encouraged to adjust their -scripts to use "git xyzzy" form, as we will stop installing -"git-xyzzy" hardlinks for built-in commands in later releases. - -Source changes needed for porting to MinGW environment are now all in the -main git.git codebase. - -By default, packfiles created with this version uses delta-base-offset -encoding introduced in v1.4.4. Pack idx files are using version 2 that -allows larger packs and added robustness thanks to its CRC checking, -introduced in v1.5.2. - - -Updates since v1.5.6 --------------------- - -(subsystems) - -* git-p4 in contrib learned "allowSubmit" configuration to control on - which branch to allow "submit" subcommand. - -(portability) - -* Sample hook scripts shipped in templates/ are now suffixed with - *.sample. We used to prevent them from triggering by default by - relying on the fact that we install them as unexecutable, but on - some filesystems this approach does not work. Instead of running - "chmod +x" on them, the users who want to activate these samples - as-is can now rename them dropping *.sample suffix. - -* perl's in-place edit (-i) does not work well without backup files on Windows; - some tests are rewritten to cope with this. - -(documentation) - -* Updated howto/update-hook-example - -* Got rid of usage of "git-foo" from the tutorial. - -* Disambiguating "--" between revs and paths is finally documented. - -(performance, robustness, sanity etc.) - -* even more documentation pages are now accessible via "man" and "git help". - -* reduced excessive inlining to shrink size of the "git" binary. - -* verify-pack checks the object CRC when using version 2 idx files. - -* When an object is corrupt in a pack, the object became unusable even - when the same object is available in a loose form, We now try harder to - fall back to these redundant objects when able. In particular, "git - repack -a -f" can be used to fix such a corruption as long as necessary - objects are available. - -* git-clone does not create refs in loose form anymore (it behaves as - if you immediately ran git-pack-refs after cloning). This will help - repositories with insanely large number of refs. - -* core.fsyncobjectfiles configuration can be used to ensure that the loose - objects created will be fsync'ed (this is only useful on filesystems - that does not order data writes properly). - -* "git commit-tree" plumbing can make Octopus with more than 16 parents. - "git commit" has been capable of this for quite some time. - -(usability, bells and whistles) - -* git-apply can handle a patch that touches the same path more than once - much better than before. - -* git-apply can be told not to trust the line counts recorded in the input - patch but recount, with the new --recount option. - -* git-archive can be told to omit certain paths from its output using - export-ignore attributes. - -* git-clone can clone from a remote whose URL would be rewritten by - configuration stored in $HOME/.gitconfig now. - -* git-diff --check now checks leftover merge conflict markers. - -* When remote side used to have branch 'foo' and git-fetch finds that now - it has branch 'foo/bar', it refuses to lose the existing remote tracking - branch and its reflog. The error message has been improved to suggest - pruning the remote if the user wants to proceed and get the latest set - of branches from the remote, including such 'foo/bar'. - -* fast-export learned to export and import marks file; this can be used to - interface with fast-import incrementally. - -* Original SHA-1 value for "update-ref -d" is optional now. - -* git-send-mail can talk not just over SSL but over TLS now. - -* You can tell "git status -u" to even more aggressively omit checking - untracked files with --untracked-files=no. - -* Error codes from gitweb are made more descriptive where possible, rather - than "403 forbidden" as we used to issue everywhere. - -(internal) - - -Fixes since v1.5.6 ------------------- - -All of the fixes in v1.5.6 maintenance series are included in -this release, unless otherwise noted. - - * diff -c/--cc showed unnecessary "deletion" lines at the context - boundary (needs backmerge to maint). - - * "git-clone " did not create leading directories for - like the scripted version used to do (needs backport to maint). - - ----------------------------------------------------------------- - -* The 'maint' branch has these fixes since v1.5.6.1. - -Avery Pennarun (1): - git-svn: avoid filling up the disk with temp files. - -Björn Steinbrink (1): - git cat-file: Fix memory leak in batch mode - -Eric Wong (1): - git-svn: don't sanitize remote names in config - -Jeff King (1): - doc/rev-parse: clarify reflog vs --until for specifying revisions - -Jochen Voss (1): - avoid off-by-one error in run_upload_archive - -Joey Hess (1): - fix git config example syntax - -Junio C Hamano (5): - diff --check: do not discard error status upon seeing a good line - git-shell: accept "git foo" form - GIT 1.5.4.6 - GIT 1.5.5.5 - Start draft release notes for 1.5.6.2 - -Thomas Rast (1): - Fix 'git show' on signed tag of signed tag of commit - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Alex Riesen (1): - Fix use of "perl -i" on Windows - -Brian Gernhardt (2): - Fix t4017-diff-retval for white-space from wc - Add test results directory to t/.gitignore - -Christian Couder (1): - help: check early if we have a command, if not try a documentation topic - -Dmitry Potapov (2): - update-hook-example: optionally allow non-fast-forward - shrink git-shell by avoiding redundant dependencies - -Don Zickus (1): - git-apply: handle a patch that touches the same path more than once - better - -Jeff King (3): - improve for-each-ref test script - fetch: report local storage errors in status table - fetch: give a hint to the user when local refs fail to update - -Jing Xue (1): - Add 'git-p4.allowSubmit' to git-p4 - -Johan Herland (4): - Incorporate fetched packs in future object traversal - Move pack_refs() and friends into libgit - Prepare testsuite for a "git clone" that packs refs - Teach "git clone" to pack refs - -Johannes Schindelin (4): - clone: respect url.insteadOf setting in global configs - commit-tree: lift completely arbitrary limit of 16 parents - Allow git-apply to recount the lines in a hunk (AKA recountdiff) - clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig - -Jonathan Nieder (7): - Documentation: fix links to tutorials and other new manual pages - whitespace fix in Documentation/git-repack.txt - Documentation: complicate example of "man git-command" - git-daemon(1): don't assume git-daemon is in /usr/bin - Documentation: prepare to be consistent about "git-" versus "git " - Documentation: be consistent about "git-" versus "git " - Documentation formatting and cleanup - -Junio C Hamano (15): - git-shell: accept "git foo" form - Prepare execv_git_cmd() for removal of builtins from the filesystem - Keep some git-* programs in $(bindir) - Allow "git-reset path" when unambiguous - Start draft release notes for 1.6.0 - diff --check: explain why we do not care whether old side is binary - check_and_emit_line(): rename and refactor - checkdiff: pass diff_options to the callback - Teach "diff --check" about new blank lines at end - diff --check: detect leftover conflict markers - Update sample pre-commit hook to use "diff --check" - Document the double-dash "rev -- path" disambiguator - t9700: skip when Test::More is not available - Update draft release notes for 1.6.0 - Update draft release notes for 1.6.0 - -Kevin Ballard (1): - git-send-email: Accept fifos as well as files - -Lea Wiemann (5): - t/test-lib.sh: add test_external and test_external_without_stderr - Git.pm: add test suite - gitweb: standarize HTTP status codes - test-lib.sh: show git init output when in verbose mode - GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy - -Linus Torvalds (4): - Split up default "core" config parsing into helper routine - Split up default "user" config parsing into helper routine - Split up default "i18n" and "branch" config parsing into helper routines - Add config option to enable 'fsync()' of object files - -Miklos Vajna (1): - A simple script to parse the results from the testcases - -Nanako Shiraishi (1): - gitcli: Document meaning of --cached and --index - -Nguyễn Thái Ngọc Duy (1): - Move all dashed-form commands to libexecdir - -Nicolas Pitre (2): - repack.usedeltabaseoffset config option now defaults to "true" - pack.indexversion config option now defaults to 2 - -Olivier Marin (2): - Documentation: remove {show,whatchanged}.difftree config options - show_stats(): fix stats width calculation - -Patrick Higgins (1): - Remove the use of '--' in merge program invocation - -Stephan Beyer (2): - api-builtin.txt: update and fix typo - t3404: stricter tests for git-rebase--interactive - -Sverre Rabbelier (2): - Modify test-lib.sh to output stats to t/test-results/* - Hook up the result aggregation in the test makefile. - -Ted Percival (1): - Don't use dash commands (git-foo) in tutorial-2 - -Thomas Rast (2): - git-send-email: add support for TLS via Net::SMTP::SSL - git-send-email: prevent undefined variable warnings if no encryption is - set - -jrnieder@uchicago.edu (1): - Documentation: don't assume git-sh-setup and git-parse-remote are in PATH - diff --git a/whats/in/2008/07/02.txt b/whats/in/2008/07/02.txt deleted file mode 100644 index 9edc43a84e..0000000000 --- a/whats/in/2008/07/02.txt +++ /dev/null @@ -1,126 +0,0 @@ -What's in git.git (Jul 2008, issue #02; Sun, 06) - - maint 78e3118 (GIT 1.5.6.2, 2008-07-04) - master 44701c6 (Merge branch 'qq/maint', 2008-07-06) ------------------------------------------------------------------------- - -With accumulated fixes, the latest maintenance release 1.5.6.2 is out. - -On the 'master' front, port to MinGW has now been merged, and the next -major release 1.6.0 is already taking shape. - ----------------------------------------------------------------- -* The 'master' branch has these since the last announcement - in addition to what is in maint. - -Adam Brewster (1): - Move read_revisions_from_stdin from builtin-rev-list.c to revision.c - -Brian Gernhardt (1): - Documentation: Point to gitcli(7) from git(1) - -Brian Hetro (5): - builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and - 'format.suffix' - convert.c: Use 'git_config_string' to get 'smudge' and 'clean' - diff.c: Use 'git_config_string' to get 'diff.external' - http.c: Use 'git_config_string' to clean up SSL config. - builtin-commit.c: Use 'git_config_string' to get 'commit.template' - -Christian Couder (2): - Fix "config_error_nonbool" used with value instead of key - Fix "config_error_nonbool" used with value instead of key - -Johannes Schindelin (2): - Windows: always chmod(, 0666) before unlink(). - git fetch-pack: do not complain about "no common commits" in an empty - repo - -Johannes Sixt (35): - Add compat/regex.[ch] and compat/fnmatch.[ch]. - Compile some programs only conditionally. - Add target architecture MinGW. - Windows: Use the Windows style PATH separator ';'. - setup.c: Prepare for Windows directory separators. - Windows: Treat Windows style path names. - Windows: Handle absolute paths in safe_create_leading_directories(). - Windows: Strip ".exe" from the program name. - Windows: Implement a wrapper of the open() function. - Windows: A minimal implemention of getpwuid(). - Windows: Work around misbehaved rename(). - Make my_mktime() public and rename it to tm_to_time_t() - Windows: Implement gettimeofday(). - Windows: Fix PRIuMAX definition. - Windows: Implement setitimer() and sigaction(). - Windows: Wrap execve so that shell scripts can be invoked. - Windows: A pipe() replacement whose ends are not inherited to children. - Windows: Implement start_command(). - Windows: A rudimentary poll() emulation. - Windows: Disambiguate DOS style paths from SSH URLs. - Windows: Implement asynchronous functions as threads. - Windows: Work around incompatible sort and find. - Windows: Implement wrappers for gethostbyname(), socket(), and connect(). - Windows: Implement a custom spawnve(). - Windows: Add a custom implementation for utime(). - Windows: Use a customized struct stat that also has the st_blocks member. - Turn builtin_exec_path into a function. - Windows: Compute the fallback for exec_path from the program invocation. - Windows: Use a relative default template_dir and ETC_GITCONFIG - When installing, be prepared that template_dir may be relative. - Windows: Make the pager work. - Windows: Work around an oddity when a pipe with no reader is written to. - Windows: Make 'git help -a' work. - Windows: TMP and TEMP environment variables specify a temporary - directory. - t4127-apply-same-fn: Avoid sed -i - -Jonathan Nieder (15): - git-format-patch(1): fix stray \ in output - Documentation: fix gitlinks - manpages: fix bogus whitespace - git(1): add comma - git-commit(1): depersonalize description - Documentation: rewrap to prepare for "git-" vs "git " change - Documentation: more "git-" versus "git " changes - gitdiffcore(7): fix awkward wording - manpages: italicize command names in synopses - manpages: italicize command names - manpages: italicize git command names (which were in teletype font) - manpages: italicize gitk's name (where it was in teletype font) - manpages: italicize nongit command names (if they are in teletype font) - manpages: italicize git subcommand names (which were in teletype font) - manpages: use teletype font for sample command lines - -Junio C Hamano (3): - fast-export --export-marks: fix off by one error - attribute documentation: keep EXAMPLE at end - clone -q: honor "quiet" option over native transports. - -Marius Storm-Olsen (1): - Windows: Add a new lstat and fstat implementation based on Win32 API. - -Matthew Ogilvie (1): - Documentation cvs: Clarify when a bare repository is needed - -Miklos Vajna (6): - Retire 'stupid' merge strategy - INSTALL: Update section about git-frotz form. - hg-to-git: avoid raising a string exception - hg-to-git: abort if the project directory is not a hg repo - hg-to-git: rewrite "git-frotz" to "git frotz" - hg-to-git: use git init instead of git init-db - -Nikolaus Schulz (1): - Documentation: be precise about which date --pretty uses - -Ramsay Allan Jones (1): - Fix some warnings (on cygwin) to allow -Werror - -Steffen Prohaska (2): - Windows: Fix ntohl() related warnings about printf formatting - compat/pread.c: Add a forward declaration to fix a warning - -Thomas Rast (2): - git-send-email: Do not attempt to STARTTLS more than once - Fix apply --recount handling of no-EOL line - diff --git a/whats/in/2008/07/03.txt b/whats/in/2008/07/03.txt deleted file mode 100644 index ab781e0e0f..0000000000 --- a/whats/in/2008/07/03.txt +++ /dev/null @@ -1,81 +0,0 @@ -What's in git.git (Jul 2008, issue #03; Mon, 07) - - maint 39f319f (Merge branch 'qq/maint' (early part) into maint, 2008-07-07) - master bed6255 (Merge branch 'qq/maint', 2008-07-07) ------------------------------------------------------------------------- - -* The 'maint' branch has these fixes since 1.5.6.2. - -Alex Riesen (1): - git-clone: remove leftover debugging fprintf(). - -Brian Hetro (5): - builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and - 'format.suffix' - convert.c: Use 'git_config_string' to get 'smudge' and 'clean' - diff.c: Use 'git_config_string' to get 'diff.external' - http.c: Use 'git_config_string' to clean up SSL config. - builtin-commit.c: Use 'git_config_string' to get 'commit.template' - -Christian Couder (1): - Fix "config_error_nonbool" used with value instead of key - -Gerrit Pape (1): - git-svn.perl: workaround assertions in svn library 1.5.0 - -Junio C Hamano (3): - attribute documentation: keep EXAMPLE at end - clone -q: honor "quiet" option over native transports. - mailinfo: feed the correct line length to decode_transfer_encoding() - -Matthew Ogilvie (1): - Documentation cvs: Clarify when a bare repository is needed - -Mikael Magnusson (1): - Fix grammar in git-rev-parse(1). - -Nikolaus Schulz (1): - Documentation: be precise about which date --pretty uses - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Abhijit Menon-Sen (2): - git-gui: Move on to the next filename after staging/unstaging a change - git-gui: Don't select the wrong file if the last listed file is staged. - -Daniel Barkalow (1): - Only use GIT_CONFIG in "git config", not other programs - -David Reiss (4): - Implement normalize_absolute_path - Fold test-absolute-path into test-path-utils - Add support for GIT_CEILING_DIRECTORIES - Eliminate an unnecessary chdir("..") - -Dmitry Potapov (1): - completion.bash: add 'skip' and 'run' to git-bisect - -Jakub Narebski (1): - gitweb: Describe projects_index format in more detail - -Johannes Schindelin (3): - Add another fast-import example, this time for .zip files - git daemon: avoid calling syslog() from a signal handler - run_command(): respect GIT_TRACE - -Johannes Sixt (1): - git-gui: Implement "Stage/Unstage Line" - -Junio C Hamano (6): - rerere: rerere_created_at() and has_resolution() abstraction - git-rerere: detect unparsable conflicts - rerere: remove dubious "tail_optimization" - t4200: fix rerere test - rerere.autoupdate - Update draft release notes for 1.6.0 - -Richard Quirk (1): - git-gui: Fix accidental staged state toggle when clicking top pixel row - diff --git a/whats/in/2008/07/04.txt b/whats/in/2008/07/04.txt deleted file mode 100644 index 2d39d5c11b..0000000000 --- a/whats/in/2008/07/04.txt +++ /dev/null @@ -1,111 +0,0 @@ -What's in git.git (Jul 2008, issue #04; Sun, 13) - - maint 191a8e3 (GIT 1.5.6.3, 2008-07-13) - master 10ce020 (Merge branch 'sp/maint-bash-completion-optim', 2008-07-13) ------------------------------------------------------------------------- - -* The 'maint' branch is at 1.5.6.3 - -* The 'master' branch has these since the last announcement - in addition to what's in 1.5.6.3 - -Abhijit Menon-Sen (2): - Implement "git stash branch " - Add a test for "git stash branch" - -Adam Brewster (1): - Teach git-bundle to read revision arguments from stdin like git-rev-list. - -Brandon Casey (1): - t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects - -Eric Hanchrow (2): - user-manual: typo and grammar fixes - Documentation: fix broken "linkgit" links - -Eric Raible (2): - Documentation: tweak use case in "git stash save --keep-index" - completion: add branch options --contains --merged --no-merged - -Jeff King (2): - Allow per-command pager config - avoid null SHA1 in oldest reflog - -Johannes Schindelin (2): - Teach "git apply" to prepend a prefix with "--root=" - Allow cherry-picking root commits - -Johannes Sixt (1): - Provide fallback definitions of PRIu32 and PRIx32 - -Junio C Hamano (17): - revision traversal: --children option - rev-list --children - builtin-blame.c: move prepare_final() into a separate function. - builtin-blame.c: allow more than 16 parents - git-blame --reverse - Per-ref reflog expiry configuration - Make default expiration period of reflog used for stash infinite - apply --root: thinkofix. - Refactor "tracking statistics" code used by "git checkout" - git-status: show the remote tracking statistics - git-branch -v: show the remote tracking statistics - stat_tracking_info(): clear object flags used during counting - branch -r -v: do not spit out garbage - git-apply --directory: make --root more similar to GNU diff - Tone down warning about GNU Interactive Tools - Documentation: update sections on naming revisions and revision ranges - apply: fix copy/rename breakage - -Mark Levedahl (1): - install-doc-quick - use git --exec-path to find git-sh-setup - -Mike Hommey (4): - Catch failures from t5540-http-push - Fix http-push test - Skip t5540-http-push test when USE_CURL_MULTI is undefined - Avoid apache complaining about lack of server's FQDN - -Petr Baudis (1): - Git.pm: Add remote_refs() git-ls-remote frontend - -Pierre Habouzit (12): - parse-opt: have parse_options_{start,end}. - parse-opt: Export a non NORETURN usage dumper. - parse-opt: create parse_options_step. - parse-opt: do not print errors on unknown options, return -2 intead. - parse-opt: fake short strings for callers to believe in. - parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option. - revisions: split handle_revision_opt() from setup_revisions() - git-blame: migrate to incremental parse-option [1/2] - git-blame: migrate to incremental parse-option [2/2] - git-blame: fix lapsus - git-shortlog: migrate to parse-options partially. - revisions: refactor handle_revision_opt into parse_revision_opt. - -Ramsay Allan Jones (3): - t9113-*.sh: provide user feedback when test skipped - t9100-git-svn-basic.sh: Fix determination of utf-8 locale - git-request-pull: replace call to deprecated peek-remote - -Robert Shearman (1): - git-send-email: Fix authenticating on some servers when using TLS. - -SZEDER Gábor (1): - stash: introduce 'stash save --keep-index' option - -Shawn O. Pearce (3): - Correct pack memory leak causing git gc to try to exceed ulimit - bash completion: Improve responsiveness of git-log completion - bash completion: Don't offer "a.." as a completion for "a." - -Stephan Beyer (3): - git-am/git-mailsplit: correct synopsis for reading from stdin - t3404: test two "preserve merges with -p" cases - Make rebase--interactive use OPTIONS_SPEC - -Thomas Rast (3): - git-add--interactive: replace hunk recounting with apply --recount - git-add--interactive: remove hunk coalescing - git-add--interactive: manual hunk editing mode - diff --git a/whats/in/2008/07/05.txt b/whats/in/2008/07/05.txt deleted file mode 100644 index 73dafc520d..0000000000 --- a/whats/in/2008/07/05.txt +++ /dev/null @@ -1,117 +0,0 @@ -What's in git.git (Jul 2008, issue #05; Tue, 15) - - maint 191a8e3 (GIT 1.5.6.3, 2008-07-13) - master fcab40a (Merge branch 'mv/merge-in-c', 2008-07-15) ------------------------------------------------------------------------- - -"Merge-in-C" is in, so is "rename .dotest", and remaining Windows bits. -Now it is almost there for 1.6.0-rc0. - -* The 'master' branch has these since the last announcement. - -Alexander N. Gavrilov (1): - Fix quadratic performance in rewrite_one. - -Brian Gernhardt (1): - Documentation: mention ORIG_HEAD in am, merge, and rebase - -Ciaran McCreesh (1): - Make git-add -i accept ranges like 7- - -Dmitry Kakurin (1): - Fixed text file auto-detection: treat EOF character 032 at the end of - file as printable - -Frederik Schwarzer (1): - git-svn: typofix - -Ian Katz (1): - tutorial: use prompt with user names in example, to clarify who is doing - what - -Johannes Schindelin (6): - Convert CR/LF to LF in tag signatures - Add pretty format %aN which gives the author name, respecting .mailmap - Move MERGE_RR from .git/rr-cache/ into .git/ - git-gui: MERGE_RR lives in .git/ directly with newer Git versions - shortlog: support --pretty=format: option - Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" - -João Abecasis (1): - git-svn: find-rev and rebase for SVN::Mirror repositories - -Junio C Hamano (10): - Introduce get_merge_bases_many() - Introduce reduce_heads() - Teach "am" and "rebase" to mark the original position with ORIG_HEAD - branch --contains: default to HEAD - branch --merged/--no-merged: allow specifying arbitrary commit - Teach merge.log to "git-merge" again - Update draft release notes for 1.6.0 - reduce_heads(): protect from duplicate input - tutorial: clarify "pull" is "fetch + merge" - Update draft release notes to 1.6.0 - -Lukas Sandström (1): - git-mailinfo: Fix getting the subject from the in-body [PATCH] line - -Mark Levedahl (2): - git-submodule - make "submodule add" more strict, and document it - git-submodule - register submodule URL if adding in place - -Mike Pape (1): - We need to check for msys as well as Windows in add--interactive. - -Miklos Vajna (15): - Move split_cmdline() to alias.c - Move commit_list_count() to commit.c - Move parse-options's skip_prefix() to git-compat-util.h - Add new test to ensure git-merge handles pull.twohead and pull.octopus - Move read_cache_unmerged() to read-cache.c - git-fmt-merge-msg: make it usable from other builtins - Introduce get_octopus_merge_bases() in commit.c - Add new test to ensure git-merge handles more than 25 refs. - Add new test case to ensure git-merge reduces octopus parents when - possible - Add new test case to ensure git-merge prepends the custom merge message - git-commit-tree: make it usable from other builtins - Fix t7601-merge-pull-config.sh on AIX - Build in merge - t6021: add a new test for git-merge-resolve - Add a new test for git-merge-resolve - -Nicolas Pitre (1): - restore legacy behavior for read_sha1_file() - -Olivier Marin (1): - builtin-rerere: more carefully find conflict markers - -Pavel Roskin (1): - t9600: allow testing with cvsps 2.2, including beta versions - -Pierre Habouzit (1): - parse-options: add PARSE_OPT_LASTARG_DEFAULT flag - -Shawn O. Pearce (3): - bash completion: Append space after file names have been completed - bash completion: Resolve git show ref:path losing ref: portion - bash completion: Remove dashed command completion support - -Soeren Finster (1): - git-gui: Exit shortcut in MacOSX repaired - -Steffen Prohaska (3): - Move code interpreting path relative to exec-dir to new function - system_path() - help.c: Add support for htmldir relative to git_exec_path() - help (Windows): Display HTML in default browser using Windows' shell API - -Stephan Beyer (1): - rerere: Separate libgit and builtin functions - -Sverre Hvammen Johansen (1): - reduce_heads(): thinkofix - -Teemu Likonen (1): - bash: Add long option completion for 'git send-email' - diff --git a/whats/in/2008/07/06.txt b/whats/in/2008/07/06.txt deleted file mode 100644 index ad7013923a..0000000000 --- a/whats/in/2008/07/06.txt +++ /dev/null @@ -1,90 +0,0 @@ -What's in git.git (Jul 2008, issue #06; Sat, 19) - - maint a1b6fb0 (GIT 1.5.6.4, 2008-07-19) - master 09651dd (Getting closer to 1.6.0-rc0, 2008-07-19) ------------------------------------------------------------------------- - -* The 'maint' branch is at 1.5.6.4. - -* The 'master' branch has these since the last announcement - in addition to what is already in 1.5.6.4. - -Alexander Gavrilov (3): - Avoid rescanning unchanged entries in search for copies. - Do not try to detect move/copy for entries below threshold. - Support gitlinks in fast-import. - -Eric Raible (1): - Teach lookup_prog not to select directories - -Eric Wong (1): - t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory" - -Fabian Emmes (2): - Testsuite: Unset CVS_SERVER - testsuite for cvs co -c - -Johannes Sixt (1): - builtin-clone: rewrite guess_dir_name() - -Junio C Hamano (9): - git-rebase: report checkout failure - t/aggregate-results: whitespace fix - Update draft release notes for 1.6.0 - read-cache.c: typofix - mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line - builtin-remote.c: fix earlier "skip_prefix()" conversion - t9001 (send-email): Do not use hardcoded /bin/sh in test - .mailmap update - Getting closer to 1.6.0-rc0 - -Lars Noschinski (2): - cvsserver: Add support for packed refs - cvsserver: Add cvs co -c support - -Lukas Sandström (3): - Make some strbuf_*() struct strbuf arguments const. - Add some useful functions for strbuf manipulation. - git-mailinfo: use strbuf's instead of fixed buffers - -Miklos Vajna (4): - t0001-init.sh: change confusing directory name - t1007-hash-object.sh: use quotes for the test description - git-bisect: use dash-less form on git bisect log - make remove-dashes: apply to scripts and programs as well, not just to - builtins - -Nanako Shiraishi (3): - cache-tree.c: make cache_tree_find() static - builtin-describe.c: make a global variable "pattern" static - parse-options.c: make check_typos() static - -Peter Harris (1): - Add ANSI control code emulation for the Windows console - -Petr Baudis (5): - Documentation/git-submodule.txt: Add Description section - Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles - Documentation/git-submodule.txt: Further clarify the description - Documentation: How to ignore local changes in tracked files - Documentation/git-merge.txt: Partial rewrite of How Merge Works - -René Scharfe (8): - archive: remove args member from struct archiver - add context pointer to read_tree_recursive() - archive: add baselen member to struct archiver_args - archive: centralize archive entry writing - archive: unify file attribute handling - archive: remove extra arguments parsing code - archive: make zip compression level independent from core git - archive: remove unused headers - -Stephan Beyer (4): - t/test-lib.sh: exit with small negagive int is ok with test_must_fail - t/: Use "test_must_fail git" instead of "! git" - Make usage strings dash-less - Link git-shell only to a subset of libgit.a - -SungHyun Nam (1): - t/Makefile: use specified shell when running aggregation script - diff --git a/whats/in/2008/07/07.txt b/whats/in/2008/07/07.txt deleted file mode 100644 index acdda3d878..0000000000 --- a/whats/in/2008/07/07.txt +++ /dev/null @@ -1,51 +0,0 @@ -What's in git.git (Jul 2008, issue #07; Sun, 20) - - maint 2d9c572 (fix usage string for git grep, 2008-07-20) - master 93310a4 (Merge branch 'ap/trackinfo', 2008-07-20) ------------------------------------------------------------------------- - -As announced in a separate message, the tip of master was tagged as -1.6.0-rc0; for people who neglected futureproofing themselves so far, it -would really be a good time to seriously consider doing so. - -* The 'maint' branch has these fixes since the last announcement. - -Jonathan Nieder (1): - fix usage string for git grep - -Junio C Hamano (1): - refresh-index: fix bitmask assignment - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Avery Pennarun (1): - Reword "your branch has diverged..." lines to reduce line length - -Dmitry Potapov (1): - git-svn: fix git svn info to work without arguments - -Junio C Hamano (8): - rerere.autoupdate: change the message when autoupdate is in effect - builtin-add.c: restructure the code for maintainability - git-add --all: add all files - git-add --all: tests - git-add --all: documentation - Link shell with compat layer functions - Move read_in_full() and write_in_full() to wrapper.c - "needs update" considered harmful - -Lars Noschinski (1): - cvsserver: Add testsuite for packed refs - -Michele Ballabio (2): - builtin-merge.c: Fix option parsing - builtin-push.c: Cleanup - use OPT_BIT() and remove some variables - -Miklos Vajna (1): - Teach 'git merge' that some merge strategies no longer exist - -Nanako Shiraishi (1): - git am --abort - diff --git a/whats/in/2008/07/08.txt b/whats/in/2008/07/08.txt deleted file mode 100644 index 96fafedc83..0000000000 --- a/whats/in/2008/07/08.txt +++ /dev/null @@ -1,119 +0,0 @@ -What's in git.git (Jul 2008, #09; Thu, 31) - - maint bfce508 (Makefile: fix shell quoting, 2008-07-25) - master 0fe8c13 (Allow "non-option" revision options in parse_option-enabled commands, 2008-07-31) ------------------------------------------------------------------------- - -Some git-gui updates for 1.6.0 are included, and then many minor fixes. -Perhaps -rc2 this weekend. - -* The 'master' branch has these since the last announcement. - -Abhijit Menon-Sen (5): - git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core - Clarify that "git log x.c y.h" lists commits that touch either file - `git submodule add` now requires a - Make it clear that push can take multiple refspecs - Make the DESCRIPTION match ... items in the SYNOPSIS - -Alex Riesen (1): - Make use of stat.ctime configurable - -Alexander Gavrilov (7): - Fix pre-commit hooks under MinGW/MSYS - Add options to control the search for copies in blame. - Kill the blame back-end on window close. - Add a menu item to invoke full copy detection in blame. - git-gui: Fix the Remote menu separator. - git-gui: Preserve scroll position on reshow_diff. - Support copy and rename detection in fast-export. - -Anders Melchiorsen (2): - Documentation: fix diff.external example - Advertise the ability to abort a commit - -Björn Steinbrink (1): - rev-parse: Add support for the ^! and ^@ syntax - -Brian Gernhardt (1): - Documentation: Remove mentions of git-svnimport. - -Cesar Eduardo Barros (2): - Documentation/git-submodule.txt: fix doubled word - Documentation/git-rev-parse.txt: update for new git-describe output - format - -Christian Couder (2): - merge-base: die with an error message if not passed a commit ref - documentation: user-manual: update "using-bisect" section - -Jakub Narebski (1): - gitweb: More about how gitweb gets 'owner' of repository - -Jeff King (2): - init: handle empty "template" parameter - Compact commit template message - -Johannes Schindelin (1): - Avoid chdir() in list_commands_in_dir() - -Johannes Sixt (2): - git-gui: Fix "Stage/Unstage Line" with one line of context. - git-gui: "Stage Line": Treat independent changes in adjacent lines better - -Jonathan Nieder (1): - t6030 (bisect): work around Mac OS X "ls" - -Junio C Hamano (11): - make sure parsed wildcard refspec ends with slash - GIT 1.6.0-rc1 - Allow building without any git installed - Allow installing in the traditional way - ls-tree documentation: enhance notes on subdirectory and pathspec - behaviour - Documentation: clarify what is shown in "git-ls-files -s" output - t7001: fix "git mv" test - Teach gitlinks to ie_modified() and ce_modified_check_fs() - Fix merge name generation in "merge in C" - Fix test-parse-options "integer" test - Teach --find-copies-harder to "git blame" - -Kevin Ballard (1): - format-patch: Produce better output with --inline or --attach - -Lars Hjemli (3): - builtin-branch: remove duplicated code - builtin-branch: factor out merge_filter matching - builtin-branch: fix -v for --[no-]merged - -Lee Marlow (1): - bash completion: Add completion for 'git help' - -Olivier Marin (1): - builtin-verify-tag: fix -v option parsing - -Petr Baudis (2): - git-mv: Remove dead code branch - git-mv: Keep moved index entries inact - -Pierre Habouzit (1): - Allow "non-option" revision options in parse_option-enabled commands - -Shawn O. Pearce (3): - git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk - fsck: Don't require tmp_obj_ file names are 14 bytes in length - git-gui: Fix gitk search in $PATH to work on Windows - -Steffen Prohaska (5): - Refactor, adding prepare_git_cmd(const char **argv) - run-command (Windows): Run dashless "git " - git-gui: Correct installation of library to be $prefix/share - git-gui (Windows): Switch to relative discovery of oguilib - git-gui (Windows): Change wrapper to execdir 'libexec/git-core' - -Thomas Rast (1): - bash completion: Add long options for 'git describe' - -Todd Zullinger (1): - Replace uses of "git-var" with "git var" - diff --git a/whats/in/2008/07/09.txt b/whats/in/2008/07/09.txt deleted file mode 100644 index 96fafedc83..0000000000 --- a/whats/in/2008/07/09.txt +++ /dev/null @@ -1,119 +0,0 @@ -What's in git.git (Jul 2008, #09; Thu, 31) - - maint bfce508 (Makefile: fix shell quoting, 2008-07-25) - master 0fe8c13 (Allow "non-option" revision options in parse_option-enabled commands, 2008-07-31) ------------------------------------------------------------------------- - -Some git-gui updates for 1.6.0 are included, and then many minor fixes. -Perhaps -rc2 this weekend. - -* The 'master' branch has these since the last announcement. - -Abhijit Menon-Sen (5): - git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core - Clarify that "git log x.c y.h" lists commits that touch either file - `git submodule add` now requires a - Make it clear that push can take multiple refspecs - Make the DESCRIPTION match ... items in the SYNOPSIS - -Alex Riesen (1): - Make use of stat.ctime configurable - -Alexander Gavrilov (7): - Fix pre-commit hooks under MinGW/MSYS - Add options to control the search for copies in blame. - Kill the blame back-end on window close. - Add a menu item to invoke full copy detection in blame. - git-gui: Fix the Remote menu separator. - git-gui: Preserve scroll position on reshow_diff. - Support copy and rename detection in fast-export. - -Anders Melchiorsen (2): - Documentation: fix diff.external example - Advertise the ability to abort a commit - -Björn Steinbrink (1): - rev-parse: Add support for the ^! and ^@ syntax - -Brian Gernhardt (1): - Documentation: Remove mentions of git-svnimport. - -Cesar Eduardo Barros (2): - Documentation/git-submodule.txt: fix doubled word - Documentation/git-rev-parse.txt: update for new git-describe output - format - -Christian Couder (2): - merge-base: die with an error message if not passed a commit ref - documentation: user-manual: update "using-bisect" section - -Jakub Narebski (1): - gitweb: More about how gitweb gets 'owner' of repository - -Jeff King (2): - init: handle empty "template" parameter - Compact commit template message - -Johannes Schindelin (1): - Avoid chdir() in list_commands_in_dir() - -Johannes Sixt (2): - git-gui: Fix "Stage/Unstage Line" with one line of context. - git-gui: "Stage Line": Treat independent changes in adjacent lines better - -Jonathan Nieder (1): - t6030 (bisect): work around Mac OS X "ls" - -Junio C Hamano (11): - make sure parsed wildcard refspec ends with slash - GIT 1.6.0-rc1 - Allow building without any git installed - Allow installing in the traditional way - ls-tree documentation: enhance notes on subdirectory and pathspec - behaviour - Documentation: clarify what is shown in "git-ls-files -s" output - t7001: fix "git mv" test - Teach gitlinks to ie_modified() and ce_modified_check_fs() - Fix merge name generation in "merge in C" - Fix test-parse-options "integer" test - Teach --find-copies-harder to "git blame" - -Kevin Ballard (1): - format-patch: Produce better output with --inline or --attach - -Lars Hjemli (3): - builtin-branch: remove duplicated code - builtin-branch: factor out merge_filter matching - builtin-branch: fix -v for --[no-]merged - -Lee Marlow (1): - bash completion: Add completion for 'git help' - -Olivier Marin (1): - builtin-verify-tag: fix -v option parsing - -Petr Baudis (2): - git-mv: Remove dead code branch - git-mv: Keep moved index entries inact - -Pierre Habouzit (1): - Allow "non-option" revision options in parse_option-enabled commands - -Shawn O. Pearce (3): - git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk - fsck: Don't require tmp_obj_ file names are 14 bytes in length - git-gui: Fix gitk search in $PATH to work on Windows - -Steffen Prohaska (5): - Refactor, adding prepare_git_cmd(const char **argv) - run-command (Windows): Run dashless "git " - git-gui: Correct installation of library to be $prefix/share - git-gui (Windows): Switch to relative discovery of oguilib - git-gui (Windows): Change wrapper to execdir 'libexec/git-core' - -Thomas Rast (1): - bash completion: Add long options for 'git describe' - -Todd Zullinger (1): - Replace uses of "git-var" with "git var" - diff --git a/whats/in/2008/08/01.txt b/whats/in/2008/08/01.txt deleted file mode 100644 index 271dae3b54..0000000000 --- a/whats/in/2008/08/01.txt +++ /dev/null @@ -1,131 +0,0 @@ -What's in git.git (Aug 2008, #01; Tue, 05) - - maint 2d0f5f3 (RelNotes 1.5.6.5 updates, 2008-08-05) - master ddd63e6 (Optimize sha1_object_info for loose objects, not concurrent repacks, 2008-08-05) ------------------------------------------------------------------------- -Thanks to many people, we have accumulated quite a few fixes that are -appropriate for 1.6.0 stabilization effort but at the same time apply -equally well to 1.5.6 series. We might want to do 1.5.6.5 to flush them -while we are at it. - -I am planning to tag 1.6.0-rc2 tomorrow evening. I noticed that both gitk -and git-gui have fixes and many updated translations that I intend to -pull before tagging -rc2. - -* The 'maint' branch has these fixes since the last announcement. - -Anders Melchiorsen (1): - Documentation: fix diff.external example - -Brandon Casey (1): - t/t4202-log.sh: add newline at end of file - -Ciaran McCreesh (1): - Make git-add -i accept ranges like 7- - -Jeff King (1): - init: handle empty "template" parameter - -Jim Meyering (1): - git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. - -Johannes Schindelin (1): - sort_in_topological_order(): avoid setting a commit flag - -Jonathan Nieder (1): - git-diff(1): "--c" -> "--cc" typo fix - -Junio C Hamano (6): - make sure parsed wildcard refspec ends with slash - Documentation: clarify diff --cc - Update my e-mail address - Start 1.5.6.5 RelNotes to describe accumulated fixes - builtin-name-rev.c: split deeply nested part from the main function - RelNotes 1.5.6.5 updates - -Linus Torvalds (1): - diff.renamelimit is a basic diff configuration - -Mike Ralphson (1): - Documentation: typos / spelling fixes in older RelNotes - -Pierre Habouzit (1): - git-submodule: move ill placed shift. - -Pieter de Bie (1): - git-name-rev: allow --name-only in combination with --stdin - -René Scharfe (1): - git-name-rev: don't use printf without format - -Stephan Beyer (1): - builtin-revert.c: typofix - -Steve Haslam (1): - Propagate -u/--upload-pack option of "git clone" to transport. - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Abhijit Menon-Sen (4): - Git.pm: localise $? in command_close_bidi_pipe() - Fix hash slice syntax error - Fix typo in perl/Git.pm - Fix typos in INSTALL - -Anders Melchiorsen (2): - Flush output in start_async - Add output flushing before fork() - -Avery Pennarun (2): - Teach "git diff -p" Pascal/Delphi funcname pattern - git-svn: Abort with an error if 'fetch' parameter is invalid. - -Brandon Casey (1): - Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long - -David D. Kilzer (1): - Fix race condition in t9119-git-svn-info.sh - -Dmitry Potapov (1): - correct access right for git-svn-dcommit test - -Eric Wong (2): - git-svn: properly set path for "info" command - t9119: conditionally re-enable test depending on svn(1) version - -Giuseppe Bilotta (2): - diff: add ruby funcname pattern - diff: chapter and part in funcname for tex - -Johannes Schindelin (2): - clone: Add an option to set up a mirror - clone --bare: Add ".git" suffix to the directory name to clone into - -Jon Jensen (1): - Fix reference to Everyday Git, which is an HTML document and not a man - page. - -Lee Marlow (11): - bash completion: remove unused function _git_diff_tree - bash completion: Add more long options for 'git log' - bash completion: Add completion for 'git grep' - bash completion: Add completion for 'git clone' - bash completion: Add completion for 'git clean' - bash completion: Add completion for 'git init' - bash completion: Add completion for 'git revert' - bash completion: More completions for 'git stash' - bash completion: Add completion for 'git archive' - bash completion: Add completion for 'git ls-files' - bash completion: Add completion for 'git mv' - -Mike Ralphson (1): - Documentation: typos / spelling fixes - -Steffen Prohaska (1): - Modify mingw_main() workaround to avoid link errors - -Steven Grimm (1): - Optimize sha1_object_info for loose objects, not concurrent repacks - diff --git a/whats/in/2008/08/02.txt b/whats/in/2008/08/02.txt deleted file mode 100644 index 23cecca25d..0000000000 --- a/whats/in/2008/08/02.txt +++ /dev/null @@ -1,124 +0,0 @@ -Subject: What's in git.git (Aug 2008, #02; Mon, 11) -X-maint-at: 4f80b27d48fee1c588810f3341ffe5d14558cea2 -X-master-at: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6 -X-maint-was: 2d0f5f3459278475602394a7165bf8919412f4e4 -X-master-was: ddd63e64e4ac7e455dff3e807bf6a6977bb61456 - -What's in git.git (Aug 2008, #02; Mon, 11) - - maint 4f80b27 (Documentation: fix invalid reference to 'mybranch' in user manual) - master 10d9d88 (Merge branch 'maint') ------------------------------------------------------------------------- - -Minor fixes toward 1.6.0 final continue to flow in, but many of them are -also applicable to 'maint'. - -Also on 'maint' branch, there are a few backmerges of topics that have -already been in 'master' for a while. Not all of them are "fixes", -though. We may or may not have 1.5.6.6 before 1.6.0 happens. - -* The 'maint' branch has these fixes since the last announcement. - -Alexander Gavrilov (1): - Fix quadratic performance in rewrite_one. - -Ivan Stankovic (1): - Documentation: fix invalid reference to 'mybranch' in user manual - -Junio C Hamano (7): - Per-ref reflog expiry configuration - Make default expiration period of reflog used for stash infinite - fix diff-tree --stdin documentation - Files given on the command line are relative to $cwd - GIT 1.5.6.5 - asciidoc markup fixes - Fix deleting reflog entries from HEAD reflog - -Linus Torvalds (4): - Split up default "core" config parsing into helper routine - Split up default "user" config parsing into helper routine - Split up default "i18n" and "branch" config parsing into helper routines - Add config option to enable 'fsync()' of object files - -Petr Baudis (1): - Fail properly when cloning from invalid HTTP URL - -Pieter de Bie (1): - reflog test: add more tests for 'reflog delete' - -Thomas Rast (1): - Documentation: rev-list-options: Fix -g paragraph formatting - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Alexander Gavrilov (6): - gitk: Kill back-end processes on window close - gitk: Arrange to kill diff-files & diff-index on quit - gitk: On Windows, use a Cygwin-specific flag for kill - gitk: Fixed broken exception handling in diff - gitk: Fixed automatic row selection during load - gitk: Fallback to selecting the head commit upon load - -Brandon Casey (3): - perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section - Makefile: set SHELL to value of SHELL_PATH - Makefile: add a target which will abort compilation with ancient shells - -Christian Stimming (2): - git-gui: Update German translation - gitk: Updated German translation - -Eric Wong (2): - git-svn: add ability to specify --commit-url for dcommit - git-svn: wrap long lines in a few places - -Johannes Schindelin (1): - clone --mirror: avoid storing repeated tags - -Johannes Sixt (1): - git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' - -Jonathan Nieder (1): - Documentation: user-manual: "git commit -a" doesn't motivate .gitignore - -Junio C Hamano (4): - GIT 1.6.0-rc2 - GIT-VERSION-GEN: mark the version 'dirty' only if there are modified - files - mailinfo: fix MIME multi-part message boundary handling - Update draft RelNotes for 1.6.0 - -Marcus Griep (2): - Fix multi-glob assertion in git-svn - git-svn: Allow deep branch names by supporting multi-globs - -Michele Ballabio (2): - git-gui: update po/it.po - git-gui: add a part about format strings in po/README - -Mikael Magnusson (2): - git-gui: Update swedish translation. - gitk: Update swedish translation. - -Nanako Shiraishi (1): - git-gui: update Japanese translation - -Pieter de Bie (1): - builtin-rm: Add a --force flag - -René Scharfe (1): - archive: allow --exec and --remote without equal sign - -SZEDER Gábor (1): - bash: remove redundant check for 'git stash apply' options - -Shawn O. Pearce (1): - git-gui: Update git-gui.pot for 0.11 nearing release - -Thomas Rast (3): - Documentation: commit-tree: remove 16 parents restriction - Documentation: filter-branch: document how to filter all refs - filter-branch: be more helpful when an annotated tag changes - diff --git a/whats/in/2008/08/03.txt b/whats/in/2008/08/03.txt deleted file mode 100644 index 0160abf6b5..0000000000 --- a/whats/in/2008/08/03.txt +++ /dev/null @@ -1,67 +0,0 @@ -Subject: What's in git.git (Aug 2008, #03; Thu, 14) -X-maint-at: 21926fe885aa6579f7aa0e89fcb6a9064f8aa516 -X-master-at: a0653d550524a0263d36fde6a8cf98941dd057ab -X-maint-was: 4f80b27d48fee1c588810f3341ffe5d14558cea2 -X-master-was: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6 - -What's in git.git (Aug 2008, #03; Thu, 14) - - maint 21926fe (t5304-prune: adjust file mtime based on system time rather than file mtime) - master a0653d5 (Merge branch 'maint') ------------------------------------------------------------------------- - -We will have the 1.6.0 final this weekend. Please keep "obviously -correct" fixes flowing in. - -* The 'maint' branch has these fixes since the last announcement. - -Brandon Casey (1): - t5304-prune: adjust file mtime based on system time rather than file - mtime - -Francis Moreau (1): - git-bisect: fix wrong usage of read(1) - -Junio C Hamano (2): - Re-fix rev-list-options documentation - Do not talk about "diff" in rev-list documentation. - -Kevin Ballard (1): - Fix escaping of glob special characters in pathspecs - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Brandon Casey (1): - test-parse-options: use appropriate cast in length_callback - -Gustaf Hendeby (2): - gitattributes: Document built in hunk header patterns - Teach git diff about BibTeX head hunk patterns - -Junio C Hamano (2): - diff --check: do not unconditionally complain about trailing empty lines - GIT 1.6.0-rc3 - -Marcus Griep (3): - Git.pm: Add faculties to allow temp files to be cached - git-svn: Make it incrementally faster by minimizing temp files - git-svn: Reduce temp file usage when dealing with non-links - -Nguyễn Thái Ngọc Duy (1): - Fix typo in comments of longest_ancestor_length() - -Petr Baudis (1): - Adjust for the new way of enabling the default post-update hook - -Stephen R. van den Berg (1): - git-daemon: SysV needs the signal handler reinstated. - -Thomas Rast (4): - Documentation: rev-list-options: Fix a typo - Documentation: rev-list-options: Rewrite simplification descriptions for - clarity - rebase -i -p: handle index and workdir correctly - rebase -i -p: fix parent rewriting - diff --git a/whats/in/2008/08/04.txt b/whats/in/2008/08/04.txt deleted file mode 100644 index 3fe6bf6b8a..0000000000 --- a/whats/in/2008/08/04.txt +++ /dev/null @@ -1,22 +0,0 @@ -Subject: What's in git.git (Aug 2008, #04; Tue, 19) -X-maint-at: 26e08a0190cb3354e43bab13ea693a5c826a8fe1 -X-master-at: c6670b348cb19c74a6d7f6943df4871eb0d8295f -X-maint-was: dba9194a49452b5f093b96872e19c91b50e526aa -X-master-was: 2ebc02d32a4360da2cf69c2b5f5bfad0716d42b0 - -What's in git.git (Aug 2008, #04; Tue, 19) - - maint 26e08a0 (t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0') - master c6670b3 (Merge branch 'maint') ------------------------------------------------------------------------- - -* The 'maint' branch has these fixes since 1.6.0. - -Brandon Casey (1): - t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0' - -Don Zickus (1): - mailinfo: re-fix MIME multipart boundary parsing - -Robert Schiele (1): - adapt git-cvsserver manpage to dash-free syntax diff --git a/whats/in/2008/08/05.txt b/whats/in/2008/08/05.txt deleted file mode 100644 index 214caf2b60..0000000000 --- a/whats/in/2008/08/05.txt +++ /dev/null @@ -1,92 +0,0 @@ -Subject: What's in git.git (Aug 2008, #05; Wed, 20) -X-maint-at: 9b99e641c11044dba661f574f9098d362a3f0ef8 -X-master-at: ea3594e04184475226109a21e71c539ff5f139fd -X-maint-was: 26e08a0190cb3354e43bab13ea693a5c826a8fe1 -X-master-was: c6670b348cb19c74a6d7f6943df4871eb0d8295f - -What's in git.git (Aug 2008, #05; Wed, 20) - - maint 9b99e64 (Update draft release notes for 1.6.0.1) - master ea3594e (Update draft release notes for 1.6.1) ------------------------------------------------------------------------- - -I have to say I've been very productive since 1.6.0 relase and it is _not_ -a good thing. Many minor bugs are discovered by the list regulars, but -they really should have been found and fixed during the -rc period. -Let's try to do better in this cycle. - -Anyway, thanks everybody for finding and fixing bugs and supplying bugfix -patches with test cases. Perhaps we would need a 1.6.0.1 this weekend. - -* The 'maint' branch has these fixes since the last announcement. - -Jeff King (2): - mailinfo: avoid violating strbuf assertion - decorate: allow const objects to be decorated - -Jim Meyering (2): - git format-patch: avoid underrun when format.headers is empty or all NLs - remote.c: remove useless if-before-free test - -Johannes Sixt (1): - Install templates with the user and group of the installing personality - -Junio C Hamano (5): - diff --check: do not get confused by new blank lines in the middle - for-each-ref: cope with tags with incomplete lines - completion: find out supported merge strategies correctly - "git-merge": allow fast-forwarding in a stat-dirty tree - Update draft release notes for 1.6.0.1 - -Tarmigan Casebolt (1): - Add hints to revert documentation about other ways to undo changes - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Brian Downing (2): - Make xdi_diff_outf interface for running xdiff_outf diffs - Use strbuf for struct xdiff_emit_state's remainder - -Dmitry Potapov (6): - teach index_fd to work with pipes - correct argument checking test for git hash-object - correct usage help string for git-hash-object - use parse_options() in git hash-object - add --path option to git hash-object - add --no-filters option to git hash-object - -Jeff King (2): - run-command: add pre-exec callback - spawn pager via run_command interface - -Jim Meyering (3): - add boolean diff.suppress-blank-empty config option - SubmittingPatches: fix a typo - reword --full-index description - -Johannes Schindelin (1): - checkout --track: make up a sensible branch name if '-b' was omitted - -Johannes Sixt (1): - Revert "Windows: Use a customized struct stat that also has the st_blocks - member." - -Junio C Hamano (4): - imap-send.c: more style fixes - xdiff-interface: hide the whole "xdiff_emit_state" business from the - caller - compat: introduce on_disk_bytes() - Update draft release notes for 1.6.1 - -Pierre Habouzit (1): - Enable threaded delta search on *BSD and Linux. - -Robert Shearman (4): - git-imap-send: Allow the program to be run from subdirectories of a git - tree - git-imap-send: Support SSL - imap-send.c: style fixes - Documentation: Improve documentation for git-imap-send(1) - diff --git a/whats/in/2008/08/06.txt b/whats/in/2008/08/06.txt deleted file mode 100644 index 9c711e9b72..0000000000 --- a/whats/in/2008/08/06.txt +++ /dev/null @@ -1,124 +0,0 @@ -Subject: What's in git.git (Aug 2008, #06; Sat, 23) -X-maint-at: 913e0e99b6a6e63af6a062622a1f94bd78fd8052 -X-master-at: d6096f17d2d5d9ccb453aabf8edc6ee238b166fc -X-maint-was: 9b99e641c11044dba661f574f9098d362a3f0ef8 -X-master-was: ea3594e04184475226109a21e71c539ff5f139fd - -What's in git.git (Aug 2008, #06; Sat, 23) - - maint 913e0e9 (unpack_trees(): protect the handcrafted in-core index from read_cache()) - master d6096f1 (Merge branch 'maint') ------------------------------------------------------------------------- - -There are a few fix-up that just have started cooking in 'next/pu'; they -eventually should be merged to 'maint', but not yet. - -There are quite a few topics graduated to 'master'. - -* The 'maint' branch has these fixes since the last announcement. - -Brandon Casey (2): - revision.h: make show_early_output an extern which is defined in - revision.c - compat/snprintf.c: handle snprintf's that always return the # chars - transmitted - -Eric Raible (1): - Completion: add missing '=' for 'diff --diff-filter' - -Eric Wong (1): - git-svn: fix dcommit to urls with embedded usernames - -Junio C Hamano (1): - unpack_trees(): protect the handcrafted in-core index from read_cache() - -Miklos Vajna (1): - Fix 'git help help' - -Tor Arvid Lund (1): - git-p4: Fix one-liner in p4_write_pipe function. - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Alex Riesen (1): - Extend "checkout --track" DWIM to support more cases - -Brandon Casey (1): - remote.c: add a function for deleting a refspec array and use it (twice) - -Christian Couder (1): - merge-base: teach "git merge-base" to drive underlying merge_bases_many() - -Dan Hensgen (1): - git-merge documentation: more details about resolving conflicts - -David Aguilar (1): - git-submodule: replace duplicated code with a module_list function - -Johan Herland (1): - Teach "git diff -p" HTML funcname patterns - -Johannes Schindelin (4): - t9700: remove useless check - tests: Clarify dependencies between tests, 'aggregate-results' and - 'clean' - Enable parallel tests - test-lib: do not remove trash_directory if called with --debug - -Johannes Sixt (1): - filter-branch: Grok special characters in tag names - -Jonathan del Strother (1): - Revert "Convert output messages in merge-recursive to past tense." - -Junio C Hamano (8): - documentation: merge-base: explain "git merge-base" with more than 2 args - merge-base-many: add trivial tests based on the documentation - git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise - merge - update-index: refuse to add working tree items beyond symlinks - add: refuse to add working tree items beyond symlinks - index: future proof for "extended" index entries - tests: use $TEST_DIRECTORY to refer to the t/ directory - templates/Makefile: install is unnecessary, just use mkdir -p - -Karl Hasselström (4): - Refactoring: Split up diff_tree_stdin - diff-tree: Note that the commit ID is printed with --stdin - Teach git diff-tree --stdin to diff trees - Add test for diff-tree --stdin with two trees - -Kirill Smelkov (1): - Teach "git diff -p" Python funcname patterns - -Marcus Griep (2): - count-objects: Add total pack size to verbose output - Update t/.gitignore to ignore all trash directories - -Marek Zawirski (1): - Make push more verbose about illegal combination of options - -Mark Levedahl (1): - git-submodule - Add 'foreach' subcommand - -Neil Roberts (1): - config.mak.in: Pass on LDFLAGS from configure - -Paolo Bonzini (1): - provide more errors for the "merge into empty head" case - -Peter Valdemar Mørch (2): - Teach git log --check to return an appropriate exit code - Teach git log --exit-code to return an appropriate exit code - -Pieter de Bie (1): - builtin-reflog: Allow reflog expire to name partial ref - -Shawn O. Pearce (1): - Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}' - -Stephan Beyer (1): - Fix commit_tree() buffer leak - diff --git a/whats/in/2008/08/07.txt b/whats/in/2008/08/07.txt deleted file mode 100644 index 3f3eae0877..0000000000 --- a/whats/in/2008/08/07.txt +++ /dev/null @@ -1,107 +0,0 @@ -Subject: What's in git.git (Aug 2008, #07; Wed, 27) -X-maint-at: c67b1fa349cc7b4341b32b9ef1c58a3821ce0830 -X-master-at: a1184d85e8752658f02746982822f43f32316803 -X-maint-was: 913e0e99b6a6e63af6a062622a1f94bd78fd8052 -X-master-was: d6096f17d2d5d9ccb453aabf8edc6ee238b166fc - -What's in git.git (Aug 2008, #07; Wed, 27) - - maint c67b1fa (ctype.c: protect tiny C preprocessor constants) - master a1184d8 (Merge branch 'mv/merge-custom') ------------------------------------------------------------------------- - -Handful fixes went to 1.6.0.1 and then a few more are on 'maint'. - -On the 'master' front, among other things: - - - "git cherry-pick" can reuse earlier conflict resolution. - - - "git merge" can use a custom strategy (if you write one). - - - "git-shell" was broken and then fixed. - - - "git submodule sync" is a new subcommand. - -* The 'maint' branch has these fixes since the last announcement. - -Alexander Gavrilov (1): - Respect core.autocrlf in combined diff - -Jeff King (1): - Fix "git log -i --grep" - -Jonathan Nieder (2): - Documentation: clarify pager. configuration - Documentation: clarify pager configuration - -Junio C Hamano (3): - merge: fix numerous bugs around "trivial merge" area - GIT 1.6.0.1 - ctype.c: protect tiny C preprocessor constants - -Linus Torvalds (1): - index-pack: be careful after fixing up the header/footer - -Miklos Vajna (1): - Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX - -Nguyễn Thái Ngọc Duy (1): - index-pack: setup git repository - -Ramsay Allan Jones (2): - Fix a warning (on cygwin) to allow -Werror - Suppress some bash redirection error messages - -Simon Hausmann (1): - Clean up the git-p4 documentation - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Abhijit Menon-Sen (1): - Make cherry-pick use rerere for conflict resolution. - -Andreas Färber (1): - Makefile: always provide a fallback when hardlinks fail - -David Aguilar (1): - git-submodule: add "sync" command - -Gustaf Hendeby (1): - Update .gitignore to ignore git-help - -Jeff King (1): - format-patch: use default diff format even with patch options - -Junio C Hamano (7): - builtin-add.c: restructure the code for maintainability - builtin-add.c: optimize -A option and "git add ." - shell: do not play duplicated definition games to shrink the executable - Build-in "git-shell" - Fix "git-merge -s bogo" help text - t7606: fix custom merge test - Revert "Build-in "git-shell"" - -Mark Levedahl (3): - git-submodule.sh - Remove trailing / from URL if found - git-submodule.sh - Remove trailing / from URL if found - git-submodule - Use "get_default_remote" from git-parse-remote - -Miklos Vajna (6): - builtin-help: make some internal functions available to other builtins - builtin-merge: allow using a custom strategy - Add a new test for using a custom merge strategy - Add a second testcase for handling invalid strategies in git-merge - builtin-help: always load_command_list() in cmd_help() - Builtin git-help. - -Nicolas Pitre (1): - discard revindex data when pack list changes - -Simon Hausmann (1): - Make it possible to abort the submission of a change to Perforce - -Tommi Virtanen (1): - Install git-shell in bindir, too - diff --git a/whats/in/2008/09/01.txt b/whats/in/2008/09/01.txt deleted file mode 100644 index 9f6a121565..0000000000 --- a/whats/in/2008/09/01.txt +++ /dev/null @@ -1,237 +0,0 @@ -Subject: What's in git.git (Sep 2008, #01; Sat, 06) -X-maint-at: aaefbfa66c348a461b3081873ef42819c8b38dac -X-master-at: ec3a4ba519c0012d58584d23f407c302e7b80eb6 -X-maint-was: c67b1fa349cc7b4341b32b9ef1c58a3821ce0830 -X-master-was: a1184d85e8752658f02746982822f43f32316803 - -What's in git.git (Sep 2008, #01; Sat, 06) - - maint aaefbfa (Update draft release notes for 1.6.0.2) - master ec3a4ba (Update draft release notes for 1.6.1) ------------------------------------------------------------------------- - -Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen -soon. Any favorite fixes (not feature enhancements) not on the list here? - -On the 'master' front, gitk, git-gui and git-svn subsystems had moderate -amount of updates. Among other things: - - - From gitk you can ask git-gui to show blame, and from git-gui's blame - you can ask gitk to show the commit and history; - - - "log --simplify-merges"; - - - "commit --author=$name" does not require "A U Thor " - in full; abbreviated request will look for a matching one in the - existing history; - - - "pack-objects" is safer against disc corruption; - - - -* The 'maint' branch has these fixes since the last announcement. - -Alex Riesen (1): - Fix use of hardlinks in "make install" - -Alexander Gavrilov (1): - git-gui: Fix string escaping in po2msg.sh - -Alexandre Bourget (2): - git-gui: Update french translation - git-gui: update all remaining translations to French. - -Andreas Färber (1): - Makefile: always provide a fallback when hardlinks fail - -Ask Bjørn Hansen (1): - Document sendemail.envelopesender configuration - -Björn Steinbrink (1): - for-each-ref: Allow a trailing slash in the patterns - -Clemens Buchacher (2): - git gui: show diffs with a minimum of 1 context line - clone: fix creation of explicitly named target directory - -Gustaf Hendeby (1): - Document clarification: gitmodules, gitattributes - -Heikki Orsila (2): - Start conforming code to "git subcmd" style - Improve documentation for --dirstat diff option - -Jeff King (2): - pretty=format: respect date format options - checkout: fix message when leaving detached HEAD - -Johan Herland (1): - Bring local clone's origin URL in line with that of a remote clone - -Jonas Fonseca (1): - Fix passwd(5) ref and reflect that commit doens't use commit-tree - -Junio C Hamano (11): - shell: do not play duplicated definition games to shrink the executable - Fix example in git-name-rev documentation - git-apply: Loosen "match_beginning" logic - gitattributes: -crlf is not binary - 'git foo' program identifies itself without dash in die() messages - Start 1.6.0.2 maintenance cycle - diff --cumulative is a sub-option of --dirstat - "blame -c" should be compatible with "annotate" - Mention the fact that 'git annotate' is only for backward compatibility. - stash: refresh the index before deciding if the work tree is dirty - Update draft release notes for 1.6.0.2 - -Linus Torvalds (1): - Fix '--dirstat' with cross-directory renaming - -Miklos Vajna (1): - Makefile: add merge_recursive.h to LIB_H - -Nanako Shiraishi (4): - tests: use "git xyzzy" form (t0000 - t3599) - tests: use "git xyzzy" form (t3600 - t6999) - tests: use "git xyzzy" form (t7000 - t7199) - tests: use "git xyzzy" form (t7200 - t9001) - -Nguyễn Thái Ngọc Duy (5): - diff*: fix worktree setup - grep: fix worktree setup - read-tree: setup worktree if merge is required - update-index: fix worktree setup - setup_git_directory(): fix move to worktree toplevel directory - -Nicolas Pitre (2): - discard revindex data when pack list changes - improve handling of sideband message display - -Paolo Bonzini (1): - make git-shell paranoid about closed stdin/stdout/stderr - -Paolo Ciarrocchi (1): - tutorial: gentler illustration of Alice/Bob workflow using gitk - -Petr Baudis (1): - bash completion: Hide more plumbing commands - -SZEDER Gábor (3): - Documentation: fix reference to a for-each-ref option - Documentation: fix disappeared lines in 'git stash' manpage - Documentation: minor cleanup in a use case in 'git stash' manual - -Shawn O. Pearce (2): - pack-objects: Allow missing base objects when creating thin packs - git-gui: Fix diff parsing for lines starting with "--" or "++" - -Teemu Likonen (1): - config.txt: Add missing colons after option name - -Yann Dirson (1): - Document gitk --argscmd flag. - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Alex Riesen (5): - Remove calculation of the longest command name from where it is not used - Remove useless memset of static command name lists in builtin-merge.c - Make main_cmds and other_cmds local to builtin-help.c - Allow git help work without PATH set - list_commands: only call git_exec_path if it is needed - -Alexander Gavrilov (14): - git-gui: Support starting gitk from Gui Blame - git-gui: Support passing blame to a parent commit. - git-gui: Better positioning in Blame Parent Commit - git-gui: Allow specifying an initial line for git gui blame. - gitk: Add option to specify the default commit on command line - gitk: Add menu item for calling git gui blame - git-gui: Support resolving conflicts via the diff context menu. - git-gui: Support calling merge tools. - git-gui: Don't allow staging files with conflicts. - git-gui: Support more merge tools. - git-gui: Support conflict states _U & UT. - git-gui: Reimplement and enhance auto-selection of diffs. - git-gui: Make F5 reselect a diff, if an untracked file is selected. - git-gui: Show special diffs for complex conflict cases. - -Brandon Casey (1): - dir.c: Avoid c99 array initialization - -Christian Stimming (1): - git-gui: Mark forgotten strings for translation. - -David Soria Parra (1): - cast pid_t's to uintmax_t to improve portability - -Eric Wong (2): - git-svn: check error code of send_txstream - t9124: clean up chdir usage - -Florian Weimer (3): - git-svn: extract base blob in generate_diff - git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob - git-svn: Send deltas during commits - -Giuseppe Bilotta (1): - gitweb: ref markers link to named shortlogs - -Gustaf Hendeby (1): - git-gui: Teach git gui about file type changes - -Junio C Hamano (11): - revision.c: whitespace fix - revision traversal: show full history with merge simplification - Topo-sort before --simplify-merges - revision --simplify-merges: use decoration instead of commit->util field - revision --simplify-merges: do not leave commits unprocessed - revision --simplify-merges: make it a no-op without pathspec - daemon.c: minor style fixup - git commit --author=$name: look $name up in existing commits - Update draft release notes for 1.6.1 - log --author/--committer: really match only with name part - Update draft release notes for 1.6.1 - -Matthias Kestenholz (1): - bash-completion: Add all submodule subcommands to the completion list - -Nicolas Pitre (5): - pack-objects: improve returned information from write_one() - improve reliability of fixup_pack_header_footer() - pack-objects: use fixup_pack_header_footer()'s validation mode - index-pack: use fixup_pack_header_footer()'s validation mode - fixup_pack_header_footer(): use nicely aligned buffer sizes - -Paul Talacko (1): - git-svn: set auto_props when renaming files - -Romain Francoise (1): - builtin-help: fallback to GIT_MAN_VIEWER before man - -Stephen R. van den Berg (4): - git-daemon: call logerror() instead of error() - git-daemon: use LOG_PID, simplify logging code - git-daemon: Simplify dead-children reaping logic - git-daemon: rewrite kindergarden, new option --max-connections - -Thomas Rast (13): - filter-branch: Extend test to show rewriting bug - filter-branch: fix ref rewriting with --subdirectory-filter - filter-branch: use --simplify-merges - Documentation: rev-list-options: move --simplify-merges documentation - git svn: catch lack of upstream info for dcommit earlier - git svn info: tests: let 'init' test run with SVN 1.5 - git svn info: tests: do not use set -e - git svn info: tests: use test_cmp instead of git-diff - git svn info: tests: fix ptouch argument order in setup - git svn info: make info relative to the current directory - git svn info: always quote URLs in 'info' output - git-svn: match SVN 1.5 behaviour of info' on unknown item - git-svn: fix 'info' tests for unknown items - -Tor Arvid Lund (1): - git-p4: Fix checkout bug when using --import-local. - diff --git a/whats/in/2008/09/02.txt b/whats/in/2008/09/02.txt deleted file mode 100644 index d6b088f73b..0000000000 --- a/whats/in/2008/09/02.txt +++ /dev/null @@ -1,94 +0,0 @@ -Subject: What's in git.git (Sep 2008, #02; Wed, 10) -X-maint-at: 873358dd2ac3bf2cea9a370d8586378a27a092f2 -X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32 -X-maint-was: aaefbfa66c348a461b3081873ef42819c8b38dac -X-master-was: ec3a4ba519c0012d58584d23f407c302e7b80eb6 - -What's in git.git (Sep 2008, #02; Wed, 10) - - maint 873358d (Update draft release notes for 1.6.0.2) - master ede4caf (Install git-cvsserver in $(bindir)) ------------------------------------------------------------------------- - -BLURB HERE - -* The 'maint' branch has these fixes since the last announcement. - -Arjen Laarhoven (1): - Use compatibility regex library for OSX/Darwin - -Junio C Hamano (4): - checkout: do not check out unmerged higher stages randomly - diff: Help "less" hide ^M from the output - log --author/--committer: really match only with name part - Update draft release notes for 1.6.0.2 - -Marcus Griep (2): - Git.pm: Use File::Temp->tempfile instead of ->new - git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl - -Miklos Vajna (1): - t7501: always use test_cmp instead of diff - -Nicolas Pitre (5): - pack-objects: improve returned information from write_one() - improve reliability of fixup_pack_header_footer() - pack-objects: use fixup_pack_header_footer()'s validation mode - index-pack: use fixup_pack_header_footer()'s validation mode - fixup_pack_header_footer(): use nicely aligned buffer sizes - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Alex Riesen (1): - Add help.autocorrect to enable/disable autocorrecting - -Andreas Ericsson (1): - Teach "git diff -p" to locate PHP class methods - -Arjen Laarhoven (1): - t6023-merge-file: Work around non-portable sed usage - -Christian Couder (1): - refs: improve comments about "reading" argument of "resolve_ref" - -Dotan Barak (1): - Use xmalloc() and friends to catch allocation failures - -Eric Wong (1): - git-svn: fix handling of even funkier branch names - -Giovanni Funchal (1): - configure: auto detect dynamic library path switches - -Heikki Orsila (1): - Start conforming code to "git subcmd" style part 2 - -Johannes Schindelin (1): - git wrapper: DWIM mistyped commands - -Johannes Sixt (1): - Windows: git-shell can be compiled again - -Junio C Hamano (2): - Makefile: Allow CC_LD_DYNPATH to be overriden - Fix git-diff-tree --stdin - -Michael J Gruber (2): - allow installation of man and html doc from the man and html branches - separate build targets for man and html documentation - -Mikael Magnusson (1): - Correct output of git-count-objects. - -Nanako Shiraishi (8): - t/t91XX-svn: start removing use of "git-" from these tests - t/t91XX git-svn tests: run "git svn" not "git-svn" - t9200: use "git cvsexportcommit" without dash - t9300, t9301: use "git fast-import/fast-export" without dash - t9700: use "git config" without dash - tests: use "git foo" without dash in strings - t9101: use "git hash-object" without dash - Install git-cvsserver in $(bindir) - diff --git a/whats/in/2008/09/03.txt b/whats/in/2008/09/03.txt deleted file mode 100644 index 3fdb102785..0000000000 --- a/whats/in/2008/09/03.txt +++ /dev/null @@ -1,138 +0,0 @@ -Subject: What's in git.git (Sep 2008, #03; Mon, 22) -X-maint-at: 8b4eb6b6cd65042c6ecb4f06f19c1f2441899ed6 -X-master-at: c76dc9592d1c770212d50ee7a7028a74f472f23b -X-maint-was: 873358dd2ac3bf2cea9a370d8586378a27a092f2 -X-master-was: ede4caf6e3204f9d63758d6410d0f124b0caab32 - -What's in git.git (Sep 2008, #03; Mon, 22) - - maint 8b4eb6b (Do not perform cross-directory renames when creating packs) - master c76dc95 (Merge branch 'maint') ------------------------------------------------------------------------- - -I think 'maint' has all the known fixes and is ready to become 1.6.0.3 -(but I may not have enough time or energy to do the release engineering -before I leave for two weeks). - -* The 'maint' branch has these fixes since the last announcement. - -Alec Berryman (2): - git-svn: factor out svnserve test code for later use - git-svn: Always create a new RA when calling do_switch for svn:// - -Brandon Casey (2): - t9700/test.pl: avoid bareword 'STDERR' in 3-argument open() - t9700/test.pl: remove File::Temp requirement - -Charles Bailey (2): - Add new test to demonstrate git archive core.autocrlf inconsistency - Make git archive respect core.autocrlf when creating zip format archives - -Dmitry Potapov (2): - git-rebase-interactive: do not squash commits on abort - git-rebase--interactive: auto amend only edited commit - -Eric Raible (1): - completion: git commit should list --interactive - -Eric Wong (1): - git-svn: fix handling of even funkier branch names - -Fabrizio Chiarello (1): - builtin-clone: fix typo - -Garry Dolley (1): - Clarified gitattributes documentation regarding custom hunk header. - -Heikki Orsila (3): - Start conforming code to "git subcmd" style part 2 - Start conforming code to "git subcmd" style part 3 - Cosmetical command name fix - -Jeff King (1): - Use compatibility regex library also on FreeBSD - -Joey Hess (1): - gitweb: avoid warnings for commits without body - -Johannes Sixt (2): - Use compatibility regex library also on AIX - git-remote: do not use user input in a printf format string - -Junio C Hamano (9): - discard_cache: reset lazy name_hash bit - diff Porcelain: do not disable auto index refreshing on -C -C - diff --quiet: make it synonym to --exit-code >/dev/null - Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set - Fix permission bits on sources checked out with an overtight umask - checkout: do not lose staged removal - GIT 1.6.0.2 - diff/diff-files: do not use --cc too aggressively - Start draft release notes for 1.6.0.3 - -Mikael Magnusson (2): - Typo "bogos" in format-patch error message. - git-repack uses --no-repack-object, not --no-repack-delta. - -Petr Baudis (1): - Do not perform cross-directory renames when creating packs - -Ralf Wildenhues (1): - Fix some manual typos. - -Thomas Rast (1): - sha1_file: link() returns -1 on failure, not errno - -Todd Zullinger (1): - Use dashless git commands in setgitperms.perl - -Yann Dirson (1): - Bust the ghost of long-defunct diffcore-pathspec. - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Bert Wesarg (1): - for-each-ref: `:short` format for `refname` - -Christian Couder (3): - bisect: test merge base if good rev is not an ancestor of bad rev - bisect: only check merge bases when needed - bisect: remove "checkout_done" variable used when checking merge bases - -Daniel Barkalow (1): - Check early that a new branch is new and valid - -Deskin Miler (1): - git-svn: testcase for partial rebuild - -Deskin Miller (1): - git-svn: do a partial rebuild if rev_map is out-of-date - -Junio C Hamano (4): - diff: vary default prefix depending on what are compared - daemon.c: avoid setlinebuf() - Update draft release notes to 1.6.1 - t5510: test "git fetch" following tags minimally - -Nicolas Pitre (3): - sha1write: don't copy full sized buffers - pack-objects: don't include missing preferred base objects - t5300: improve SHA1 collision test - -Quy Tonthat (1): - Update RPM spec for the new location of git-cvsserver. - -René Scharfe (3): - log: add load_ref_decorations() - move load_ref_decorations() to log-tree.c and export it - add '%d' pretty format specifier to show decoration - -SZEDER Gábor (1): - bash: use for-each-ref format 'refname:short' - -Thomas Rast (2): - rev-list: fix --reverse interaction with --parents - t6013: replace use of 'tac' with equivalent Perl - diff --git a/whats/in/2008/09/04.txt b/whats/in/2008/09/04.txt deleted file mode 100644 index c3b90316d5..0000000000 --- a/whats/in/2008/09/04.txt +++ /dev/null @@ -1,178 +0,0 @@ -Subject: What's in git.git (Sep 2008, #04; Mon, 29) -X-maint-at: edb7e82f72106add9f2fbaf9d99d9532a72e3f91 -X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1 -X-maint-was: db87e3960c5a770db13c9ba9602b5e88848e2d1a -X-master-was: c4275591fbb7d582c397b228e38dbb8419c89330 - -What's in git.git (Sep 2008, #04; Mon, 29) - - maint edb7e82 (Merge branch 'bc/maint-diff-hunk-header-fix' into maint) - master 9800c0d (Merge branch 'bc/master-diff-hunk-header-fix') ------------------------------------------------------------------------- - -With Junio offline for another week we won't see a 1.6.0.3 until -probably mid-October. With that in mind I've merged a number of -topics and trivial patches to maint so we can shake these out -before the 1.6.0.3 release. - -* The 'maint' branch has these fixes since the last announcement. - -Alex Riesen (3): - Remove empty directories in recursive merge - Add remove_path: a function to remove as much as possible of a path - Use remove_path from dir.c instead of own implementation - -Brandon Casey (5): - diff.c: return pattern entry pointer rather than just the hunk header - pattern - diff.c: associate a flag with each pattern and use it for compiling regex - diff.*.xfuncname which uses "extended" regex's for hunk header selection - t4018-diff-funcname: test syntax of builtin xfuncname patterns - git-stash.sh: don't default to refs/stash if invalid ref supplied - -Chris Frey (1): - Documentation: clarify the details of overriding LESS via core.pager - -Deskin Miller (1): - maint: check return of split_cmdline to avoid bad config strings - -Johan Herland (2): - for-each-ref: Fix --format=%(subject) for log message without newlines - Use strchrnul() instead of strchr() plus manual workaround - -Jonas Fonseca (1): - checkout: Do not show local changes when in quiet mode - -Junio C Hamano (2): - diff: use extended regexp to find hunk headers - diff hunk pattern: fix misconverted "\{" tex macro introducers - -Michael J Gruber (1): - make "git remote" report multiple URLs - -Ping Yin (1): - git-submodule: Fix "Unable to checkout" for the initial 'update' - -Rafael Garcia-Suarez (1): - Clarify commit error message for unmerged files - -Shawn O. Pearce (1): - Update release notes for 1.6.0.3 - -Stephen Haberman (1): - Clarify how the user can satisfy stash's 'dirty state' check. - - -* The 'master' branch has these since the last announcement - in addition to the above. - -Alex Riesen (1): - Cleanup remove_path - -Alexander Gavrilov (9): - git-gui: Fix Blame Parent & Context for working copy lines. - git-gui: Restore ability to Stage Working Copy for conflicts. - git-gui: Add more integration options to citool. - git-gui: Cleanup handling of the default encoding. - git-gui: Add a menu of available encodings. - git-gui: Allow forcing display encoding for diffs using a submenu. - git-gui: Optimize encoding name resolution using a lookup table. - git-gui: Support the encoding menu in gui blame. - git-gui: Reenable staging unmerged files by clicking the icon. - -Anders Melchiorsen (2): - wt-status: Split header generation into three functions - wt-status: Teach how to discard changes in the working directory - -Brandon Casey (1): - t4018-diff-funcname: test syntax of builtin xfuncname patterns - -Christian Stimming (2): - git-gui: I18n fix sentence parts into full sentences for translation - again. - git-gui: Updated German translation. - -Dmitry Potapov (1): - mingw: remove use of _getdrive() from lstat/fstat - -Garry Dolley (1): - Fixed some grammatical errors in git-rebase.txt documentation. - -Giuseppe Bilotta (1): - gitweb: shortlog now also obeys $hash_parent - -Heikki Orsila (1): - diff --dirstat-by-file: count changed files, not lines - -Johan Herland (2): - Fix AsciiDoc errors in merge documentation - Fix submodule sync with relative submodule URLs - -Johannes Sixt (1): - compat/mingw: Support a timeout in the poll emulation if no fds are given - -Joshua Williams (1): - git-gui: Add support for calling out to the prepare-commit-msg hook - -Junio C Hamano (21): - checkout -f: allow ignoring unmerged paths when checking out of the index - checkout --ours/--theirs: allow checking out one side of a conflicting - merge - xdl_fill_merge_buffer(): separate out a too deeply nested function - xdiff-merge: optionally show conflicts in "diff3 -m" style - xmerge.c: minimum readability fixups - xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less - rerere.c: use symbolic constants to keep track of parsing states - rerere: understand "diff3 -m" style conflicts with the original - merge.conflictstyle: choose between "merge" and "diff3 -m" styles - git-merge-recursive: learn to honor merge.conflictstyle - checkout -m: recreate merge when checking out of unmerged index - checkout --conflict=