mirror of
https://github.com/git/git.git
synced 2026-01-15 13:19:10 +00:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <mode> 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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <src> <dst>" did not create leading directories for <dst>
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <newbranch> <stash>"
|
||||
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=<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
|
||||
|
||||
@@ -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<tab> 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'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <path>
|
||||
Make it clear that push can take multiple refspecs
|
||||
Make the DESCRIPTION match <x>... 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 <cmd>"
|
||||
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"
|
||||
|
||||
@@ -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 <path>
|
||||
Make it clear that push can take multiple refspecs
|
||||
Make the DESCRIPTION match <x>... 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 <cmd>"
|
||||
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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.<cmd> 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
|
||||
|
||||
@@ -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 <author@email.xz>"
|
||||
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.
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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=<style>: recreate merge in a non-default style
|
||||
git-merge documentation: describe how conflict is presented
|
||||
safe_create_leading_directories(): make it about "leading" directories
|
||||
git-apply:--include=pathspec
|
||||
is_directory(): a generic helper function
|
||||
receive-pack: make it a builtin
|
||||
push: prepare sender to receive extended ref information from the
|
||||
receiver
|
||||
push: receiver end advertises refs from alternate repositories
|
||||
diff: use extended regexp to find hunk headers
|
||||
diff: fix "multiple regexp" semantics to find hunk header comment
|
||||
|
||||
Miklos Vajna (13):
|
||||
Split out merge_recursive() to merge-recursive.c
|
||||
merge-recursive: introduce merge_options
|
||||
builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
cherry-pick/revert: make direct internal call to merge_tree()
|
||||
merge-recursive: move call_depth to struct merge_options
|
||||
merge-recursive: get rid of the index_only global variable
|
||||
merge-recursive: move the global obuf to struct merge_options
|
||||
merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
merge-recursive: get rid of virtual_id
|
||||
builtin-merge: release the lockfile in try_merge_strategy()
|
||||
commit_tree(): add a new author parameter
|
||||
builtin-commit: use commit_tree()
|
||||
t7603: add new testcases to ensure builtin-commit uses reduce_heads()
|
||||
|
||||
Nanako Shiraishi (4):
|
||||
remote.c: make free_ref(), parse_push_refspec() and free_refspecs()
|
||||
static.
|
||||
graph.c: make many functions static
|
||||
usage.c: remove unused functions
|
||||
Add contrib/rerere-train script
|
||||
|
||||
Petr Baudis (1):
|
||||
git-web--browse: Support for using /bin/start on MinGW
|
||||
|
||||
Pieter de Bie (1):
|
||||
git wrapper: also use aliases to correct mistyped commands
|
||||
|
||||
Shawn O. Pearce (3):
|
||||
git-gui: Hide commit related UI during citool --nocommit
|
||||
git-gui: Use gitattribute "encoding" for file content display
|
||||
git-gui: Assume `blame --incremental` output is in UTF-8
|
||||
|
||||
Stephan Beyer (1):
|
||||
merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
|
||||
@@ -1,114 +0,0 @@
|
||||
Subject: What's in git.git (Oct 2008, #01; Mon, 06)
|
||||
X-maint-at: e261cf94848d31868c21fb11cade51c30dfcdbe7
|
||||
X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed
|
||||
X-maint-was: edb7e82f72106add9f2fbaf9d99d9532a72e3f91
|
||||
X-master-was: 9800c0df412869c7949935b61581b9361fc49bd1
|
||||
|
||||
What's in git.git (Oct 2008, #01; Mon, 06)
|
||||
|
||||
maint e261cf9 (Update release notes for 1.6.0.3)
|
||||
master 276328f (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Junio should be returning from vacation this week. I will keep
|
||||
updating my git/spearce.git tree until he gets back and asks for
|
||||
my current topic heads.
|
||||
|
||||
Once Junio gets back I think we need to focus on getting 1.6.0.3
|
||||
out the door. We have 77 commits queued up since 1.6.0.2 and it
|
||||
has been almost 4 weeks since our last maint release.
|
||||
|
||||
So please, test, test, test maint.
|
||||
|
||||
--------
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Alexander Gavrilov (1):
|
||||
builtin-blame: Fix blame -C -C with submodules.
|
||||
|
||||
David Soria Parra (1):
|
||||
Solaris: Use OLD_ICONV to avoid compile warnings
|
||||
|
||||
Dmitry Potapov (2):
|
||||
make prefix_path() never return NULL
|
||||
do not segfault if make_cache_entry failed
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
gitweb: remove PATH_INFO from $my_url and $my_uri
|
||||
|
||||
Jakub Narebski (2):
|
||||
gitweb: Fix two 'uninitialized value' warnings in git_tree()
|
||||
gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh
|
||||
|
||||
Linus Torvalds (1):
|
||||
fix bogus "diff --git" header from "diff --no-index"
|
||||
|
||||
Luc Heinrich (1):
|
||||
git-svn: call 'fatal' correctly in set-tree
|
||||
|
||||
Michael Prokop (1):
|
||||
Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
|
||||
|
||||
Nanako Shiraishi (2):
|
||||
docs: describe pre-rebase hook
|
||||
Teach rebase -i to honor pre-rebase hook
|
||||
|
||||
SZEDER Gábor (3):
|
||||
t0024: add executable permission
|
||||
Documentation: remove '\' in front of short options
|
||||
bash: remove fetch, push, pull dashed form leftovers
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
Update release notes for 1.6.0.3
|
||||
|
||||
Tuncer Ayaz (1):
|
||||
Fix fetch/clone --quiet when stdout is connected
|
||||
|
||||
martin f. krafft (1):
|
||||
Improve git-log documentation wrt file filters
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Brandon Casey (1):
|
||||
diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785
|
||||
|
||||
David Aguilar (1):
|
||||
tests: add a testcase for "git submodule sync"
|
||||
|
||||
David Bryson (1):
|
||||
Use "git_config_string" to simplify "builtin-gc.c" code where
|
||||
"prune_expire" is set
|
||||
|
||||
Dmitry Potapov (1):
|
||||
do not segfault if make_cache_entry failed
|
||||
|
||||
Jeff King (1):
|
||||
tests: grep portability fixes
|
||||
|
||||
Jonathan del Strother (1):
|
||||
Add OS X support to the pre-auto-gc example hook
|
||||
|
||||
Nanako Shiraishi (5):
|
||||
dir.c: make dir_add_name() and dir_add_ignored() static
|
||||
run-command.c: remove run_command_v_opt_cd()
|
||||
config.c: make git_parse_long() static
|
||||
commit.c: make read_graft_file() static
|
||||
archive.c: make archiver static
|
||||
|
||||
Nicolas Pitre (1):
|
||||
fix openssl headers conflicting with custom SHA1 implementations
|
||||
|
||||
Petr Baudis (3):
|
||||
gitweb: Quote non-displayable characters in hex, not octal
|
||||
config.c: Tolerate UTF8 BOM at the beginning of config file
|
||||
gitweb: Identify all summary metadata table rows
|
||||
|
||||
Ralf Wildenhues (1):
|
||||
Correct typos in RelNotes-1.6.1
|
||||
|
||||
SZEDER Gábor (1):
|
||||
remove vim syntax highlighting in favor of upstream
|
||||
|
||||
@@ -1,128 +0,0 @@
|
||||
Subject: What's in git/spearce.git (Oct 2008, #02; Sun, 12)
|
||||
X-maint-at: 72d404debaa804fca82fd9cf710fbde48c7305c6
|
||||
X-master-at: 5c283eb13c94be6ca974aa722159dc9838d10d97
|
||||
X-maint-was: e261cf94848d31868c21fb11cade51c30dfcdbe7
|
||||
X-master-was: 276328ffb87cefdc515bee5f09916aea6e0244ed
|
||||
|
||||
What's in git/spearce.git (Oct 2008, #02; Sun, 12)
|
||||
|
||||
maint 72d404d (test-lib: fix broken printf)
|
||||
master 5c283eb (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Brandon Casey (2):
|
||||
builtin-merge.c: allocate correct amount of memory
|
||||
git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
|
||||
|
||||
Deskin Miller (1):
|
||||
git init: --bare/--shared overrides system/global config
|
||||
|
||||
Imre Deak (1):
|
||||
builtin-apply: fix typo leading to stack corruption
|
||||
|
||||
Jeff King (2):
|
||||
Makefile: do not set NEEDS_LIBICONV for Solaris 8
|
||||
git apply --directory broken for new files
|
||||
|
||||
Johannes Schindelin (2):
|
||||
git rm: refresh index before up-to-date check
|
||||
rebase -i: do not fail when there is no commit to cherry-pick
|
||||
|
||||
Johannes Sixt (1):
|
||||
git-push.txt: Describe --repo option in more detail
|
||||
|
||||
Mikael Magnusson (1):
|
||||
Fix a few typos in relnotes
|
||||
|
||||
Miklos Vajna (1):
|
||||
test-lib: fix color reset in say_color()
|
||||
|
||||
Nicolas Pitre (1):
|
||||
fix pread()'s short read in index-pack
|
||||
|
||||
SZEDER Gábor (2):
|
||||
rebase -i: proper prepare-commit-msg hook argument when squashing
|
||||
rebase -i: remove leftover debugging
|
||||
|
||||
Samuel Tardieu (1):
|
||||
Do not use errno when pread() returns 0
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
test-lib: fix broken printf
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Brandon Casey (4):
|
||||
xdiff-interface.c: strip newline (and cr) from line before pattern
|
||||
matching
|
||||
Replace xmalloc/memset(0) pairs with xcalloc
|
||||
t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
|
||||
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
|
||||
|
||||
Dmitry Potapov (4):
|
||||
add have_git_dir() function
|
||||
mingw: move common functionality to win32.h
|
||||
cygwin: Use native Win32 API for stat
|
||||
print an error message for invalid path
|
||||
|
||||
Florian Ragwitz (1):
|
||||
Add git-svn branch to allow branch creation in SVN repositories
|
||||
|
||||
Jonathan del Strother (1):
|
||||
Teach git diff about Objective-C syntax
|
||||
|
||||
Junio C Hamano (1):
|
||||
git-add --intent-to-add (-N)
|
||||
|
||||
Linus Torvalds (1):
|
||||
date/time: do not get confused by fractional seconds
|
||||
|
||||
Matt McCutchen (1):
|
||||
"git diff <tree>{3,}": do not reverse order of arguments
|
||||
|
||||
Michael J Gruber (1):
|
||||
make prune report removed objects on -v
|
||||
|
||||
Michael Witten (9):
|
||||
Docs: send-email's usage text and man page mention same options
|
||||
Docs: send-email usage text much sexier
|
||||
Docs: send-email: Man page option ordering
|
||||
send-email: change --no-validate to boolean --[no-]validate
|
||||
Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
|
||||
Docs: send-email: Remove unnecessary config variable description
|
||||
Docs: send-email: Create logical groupings for --help text
|
||||
Docs: send-email: Create logical groupings for man text
|
||||
send-email: signedoffcc -> signedoffbycc, but handle both
|
||||
|
||||
Mike Ralphson (1):
|
||||
gitweb: Sort the list of forks on the summary page by age
|
||||
|
||||
Miklos Vajna (2):
|
||||
builtin-merge: refresh the index before calling a strategy
|
||||
Cleanup in sha1_file.c::cache_or_unpack_entry()
|
||||
|
||||
Petr Baudis (5):
|
||||
gitweb: Clean-up sorting of project list
|
||||
gitweb: Add support for extending the action bar with custom links
|
||||
gitweb: Support for tag clouds
|
||||
gitweb: Make the by_tag filter delve in forks as well
|
||||
gitweb: Support for simple project search form
|
||||
|
||||
Pierre Habouzit (3):
|
||||
parse-opt: migrate fmt-merge-msg.
|
||||
parse-opt: migrate git-merge-base.
|
||||
parse-opt: migrate builtin-merge-file.
|
||||
|
||||
Raphael Zimmerer (1):
|
||||
git grep: Add "-z/--null" option as in GNU's grep.
|
||||
|
||||
Teemu Likonen (1):
|
||||
bash completion: Add --[no-]validate to "git send-email"
|
||||
|
||||
Thomas Rast (1):
|
||||
Documentation: remove stale howto/rebase-and-edit.txt
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
Subject: What's in git.git (Oct 2008, #03; Tue, 14)
|
||||
X-maint-at: 6c1679254cb6be7b268d1431595e1626bf18792d
|
||||
X-master-at: 67faaaba8338cf59c212ce5239eeb223a77acdf0
|
||||
X-maint-was: 72d404debaa804fca82fd9cf710fbde48c7305c6
|
||||
X-master-was: 5c283eb13c94be6ca974aa722159dc9838d10d97
|
||||
|
||||
What's in git.git (Oct 2008, #03; Tue, 14)
|
||||
|
||||
maint 6c16792 (Update draft release notes to 1.6.0.3)
|
||||
master 67faaab (Update draft release notes to 1.6.1)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Just trying to get my development repository back in sync with what I
|
||||
received from Shawn. Thanks to everybody, I think maint is ready for
|
||||
1.6.0.3.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Junio C Hamano (1):
|
||||
Update draft release notes to 1.6.0.3
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Jeff King (1):
|
||||
tests: shell negation portability fix
|
||||
|
||||
Junio C Hamano (1):
|
||||
Update draft release notes to 1.6.1
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
Subject: What's in git.git (Oct 2008, #04; Sat, 18)
|
||||
X-maint-at: f430c8e44d0548e844d817fc32be7c38b2b6856c
|
||||
X-master-at: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344
|
||||
X-maint-was: 72d404debaa804fca82fd9cf710fbde48c7305c6
|
||||
X-master-was: 5c283eb13c94be6ca974aa722159dc9838d10d97
|
||||
|
||||
What's in git.git (Oct 2008, #04; Sat, 18)
|
||||
|
||||
maint f430c8e (Hopefully the final draft release notes update before 1.6.0.3)
|
||||
master 3041b98 (Update draft release notes for 1.6.1)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Hopefully what's in 'maint' today can become 1.6.0.3 soon, perhaps in mid
|
||||
next week.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Björn Steinbrink (1):
|
||||
force_object_loose: Fix memory leak
|
||||
|
||||
Brandon Casey (4):
|
||||
remote.c: correct the check for a leading '/' in a remote name
|
||||
t4018-diff-funcname: rework negated last expression test
|
||||
t4018-diff-funcname: demonstrate end of line funcname matching flaw
|
||||
xdiff-interface.c: strip newline (and cr) from line before pattern
|
||||
matching
|
||||
|
||||
Dan McGee (1):
|
||||
contrib: update packinfo.pl to not use dashed commands
|
||||
|
||||
Daniel Barkalow (1):
|
||||
Check early that a new branch is new and valid
|
||||
|
||||
Jeff King (1):
|
||||
tests: shell negation portability fix
|
||||
|
||||
Jonas Fonseca (1):
|
||||
git-check-attr(1): add output and example sections
|
||||
|
||||
Junio C Hamano (3):
|
||||
Update draft release notes to 1.6.0.3
|
||||
diff(1): clarify what "T"ypechange status means
|
||||
Hopefully the final draft release notes update before 1.6.0.3
|
||||
|
||||
Matt McCutchen (1):
|
||||
t1301-shared-repo.sh: don't let a default ACL interfere with the test
|
||||
|
||||
Mikael Magnusson (1):
|
||||
Typo "does not exists" when git remote update remote.
|
||||
|
||||
Miklos Vajna (1):
|
||||
Add testcase to ensure merging an early part of a branch is done properly
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Andreas Ericsson (1):
|
||||
git commit: Reformat output somewhat
|
||||
|
||||
Brandon Casey (1):
|
||||
t4018-diff-funcname: add objective-c xfuncname pattern to syntax test
|
||||
|
||||
Jeff King (3):
|
||||
reformat informational commit message
|
||||
tutorial: update output of git commit
|
||||
tests: shell negation portability fix
|
||||
|
||||
Junio C Hamano (2):
|
||||
Update draft release notes to 1.6.1
|
||||
Update draft release notes for 1.6.1
|
||||
|
||||
Miklos Vajna (1):
|
||||
Add Linux PPC support to the pre-auto-gc example hook
|
||||
|
||||
Pieter de Bie (1):
|
||||
builtin-commit.c: show on which branch a commit was added
|
||||
|
||||
@@ -1,131 +0,0 @@
|
||||
Subject: What's in git.git (Oct 2008, #05; Wed, 22)
|
||||
X-maint-at: 031e6c898f61db1ae0c0be641eac6532c1000d56
|
||||
X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0
|
||||
X-maint-was: f430c8e44d0548e844d817fc32be7c38b2b6856c
|
||||
X-master-was: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344
|
||||
|
||||
What's in git.git (Oct 2008, #05; Wed, 22)
|
||||
|
||||
maint 031e6c8 (GIT 1.6.0.3)
|
||||
master 759ad19 (submodule: fix some non-portable grep invocations)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
BLURB HERE
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Abhijit Bhopatkar (1):
|
||||
Documentation: Clarify '--signoff' for git-commit
|
||||
|
||||
Junio C Hamano (2):
|
||||
Fix testcase failure when extended attributes are in use
|
||||
GIT 1.6.0.3
|
||||
|
||||
Nicolas Pitre (1):
|
||||
rehabilitate 'git index-pack' inside the object store
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alexander Gavrilov (3):
|
||||
gitk: Fix a bug in collapsing deeply nested trees
|
||||
gitk: Enhance file encoding support
|
||||
gitk: Implement batch lookup and caching of encoding attrs
|
||||
|
||||
Andreas Ericsson (1):
|
||||
rebase: Support preserving merges in non-interactive mode
|
||||
|
||||
Brian Gernhardt (1):
|
||||
format-patch: autonumber by default
|
||||
|
||||
Christian Stimming (1):
|
||||
gitk: Add untranslated error messages to translation
|
||||
|
||||
Dmitry Potapov (2):
|
||||
check-attr: add an internal check_attr() function
|
||||
check-attr: Add --stdin option
|
||||
|
||||
Fredrik Skolmli (1):
|
||||
Documentation: Spelling fix
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
gitweb: refactor input parameters parse/validation
|
||||
|
||||
Jeff King (8):
|
||||
refactor handling of "other" files in ls-files and status
|
||||
t4012: use test_cmp instead of cmp
|
||||
diff: unify external diff and funcname parsing code
|
||||
diff: introduce diff.<driver>.binary
|
||||
diff: add filter for converting binary to text
|
||||
document "intent to add" option to git-add
|
||||
rm: loosen safety valve for empty files
|
||||
submodule: fix some non-portable grep invocations
|
||||
|
||||
Johannes Schindelin (1):
|
||||
Fix fetch/pull when run without --update-head-ok
|
||||
|
||||
Johannes Sixt (1):
|
||||
git-remote: list branches in vertical lists
|
||||
|
||||
Jonas Fonseca (1):
|
||||
git-check-attr(1): use 'verse' for multi-line synopsis sections
|
||||
|
||||
Junio C Hamano (6):
|
||||
pull: allow "git pull origin $something:$current_branch" into an unborn
|
||||
branch
|
||||
Fix "checkout --track -b newbranch" on detached HEAD
|
||||
reset --hard/read-tree --reset -u: remove unmerged new paths
|
||||
demonstrate breakage of detached checkout with symbolic link HEAD
|
||||
Enhance hold_lock_file_for_{update,append}() API
|
||||
Fix mismerge at cdb22c4 in builtin-checkout.c
|
||||
|
||||
Lee Marlow (2):
|
||||
bash completion: Add 'workflows' to 'git help'
|
||||
workflows documentation: fix link to git-request-pull[1]
|
||||
|
||||
Mark Levedahl (1):
|
||||
compat/cygwin.c - Use cygwin's stat if core.filemode == true
|
||||
|
||||
Matt McCutchen (1):
|
||||
git-merge-recursive: honor merge.conflictstyle once again
|
||||
|
||||
Miklos Vajna (2):
|
||||
builtin-commit: use reduce_heads() only when appropriate
|
||||
Implement git clone -v
|
||||
|
||||
Nanako Shiraishi (2):
|
||||
rebase --no-verify
|
||||
rebase: Document --no-verify option to bypass pre-rebase hook
|
||||
|
||||
Paul Mackerras (6):
|
||||
gitk: Use <Button-2> for context menus on OSX
|
||||
gitk: Clean up file encoding code and add enable/disable option
|
||||
gitk: Fix binding for <Return> in sha1 entry field
|
||||
gitk: New way of constructing menus that allows for Alt+letter
|
||||
accelerators
|
||||
gitk: Regenerate .po files
|
||||
gitk: Turn short SHA1 names into links too
|
||||
|
||||
Petr Baudis (1):
|
||||
Do not rename read-only files during a push
|
||||
|
||||
René Scharfe (3):
|
||||
add alloc_ref_with_prefix()
|
||||
use alloc_ref_from_str() everywhere
|
||||
make alloc_ref_from_str() the new alloc_ref()
|
||||
|
||||
Richard Quirk (1):
|
||||
gitk: Bind Key-Return to create on new branch dialog
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
describe: Make --tags and --all match lightweight tags more often
|
||||
|
||||
Stephen Haberman (1):
|
||||
rebase--interactive: fix parent rewriting for dropped commits
|
||||
|
||||
Thomas Rast (3):
|
||||
Documentation: new upstream rebase recovery section in git-rebase
|
||||
Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
Documentation: add manpage about workflows
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
Subject: What's in git.git (Nov 2008, #01; Sun, 02)
|
||||
X-maint-at: 1a9016aae5aa8c468bb2d8d5dd16303d5c005869
|
||||
X-master-at: 6a509a6f7f38906996ac791449d5bcc2f32eef23
|
||||
X-maint-was: 031e6c898f61db1ae0c0be641eac6532c1000d56
|
||||
X-master-was: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0
|
||||
|
||||
What's in git.git (Nov 2008, #01; Sun, 02)
|
||||
|
||||
maint 1a9016a (Start 1.6.0.4 cycle)
|
||||
master 6a509a6 (Update draft release notes to 1.6.1)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
There are several topic branches destined for 'maint' that have been
|
||||
cooking and have graduated to 'master', and I'll make the noise about
|
||||
1.6.0.4 louder once they are merged, but not yet.
|
||||
|
||||
On the 'master' front, there are quite a few git-gui updates.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Alex Riesen (3):
|
||||
Plug a memleak in builtin-revert
|
||||
Add --verbose|-v to test-chmtime
|
||||
Use test-chmtime -v instead of perl in t5000 to get mtime of a file
|
||||
|
||||
Charles Bailey (1):
|
||||
git-archive: work in bare repos
|
||||
|
||||
Deskin Miller (2):
|
||||
git-svn: change dashed git-config to git config
|
||||
git-svn: change dashed git-commit-tree to git commit-tree
|
||||
|
||||
Gustaf Hendeby (1):
|
||||
git-gui: Help identify aspell version on Windows too
|
||||
|
||||
Jakub Narebski (1):
|
||||
Documentation/gitattributes: Add subsection header for each attribute
|
||||
|
||||
Jan Krüger (1):
|
||||
Documentation: clarify information about 'ident' attribute
|
||||
|
||||
Jeff King (4):
|
||||
correct cache_entry allocation
|
||||
pack-objects: avoid reading uninitalized data
|
||||
fix overlapping memcpy in normalize_absolute_path
|
||||
send-pack: do not send out single-level refs such as refs/stash
|
||||
|
||||
Jonas Fonseca (1):
|
||||
asciidoc: add minor workaround to add an empty line after code blocks
|
||||
|
||||
Junio C Hamano (1):
|
||||
Start 1.6.0.4 cycle
|
||||
|
||||
Linus Torvalds (1):
|
||||
Add file delete/create info when we overflow rename_limit
|
||||
|
||||
Markus Heidelberg (1):
|
||||
bash completion: add doubledash to "git show"
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
Install git-cvsserver in $(bindir)
|
||||
|
||||
Pierre Habouzit (1):
|
||||
git send-email: avoid leaking directory file descriptors.
|
||||
|
||||
Thomas Rast (1):
|
||||
add -p: warn if only binary changes present
|
||||
|
||||
Tom Preston-Werner (1):
|
||||
add instructions on how to send patches to the mailing list with Gmail
|
||||
|
||||
Tommi Virtanen (1):
|
||||
Install git-shell in bindir, too
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alexander Gavrilov (6):
|
||||
git-gui: Make Ctrl-T safe to use for conflicting files.
|
||||
git-gui: Fix the blame window shape.
|
||||
git-gui: Add a search command to the blame viewer.
|
||||
git-gui: Fix the blame viewer destroy handler.
|
||||
git-gui: Add a dialog that shows the OpenSSH public key.
|
||||
git-gui: Add a simple implementation of SSH_ASKPASS.
|
||||
|
||||
Christian Stimming (1):
|
||||
git-gui: Update German translation.
|
||||
|
||||
Jan Krüger (1):
|
||||
Introduce receive.denyDeletes
|
||||
|
||||
Joey Hess (1):
|
||||
git-daemon: set REMOTE_ADDR to client address
|
||||
|
||||
Johannes Sixt (6):
|
||||
git-gui: Do not automatically stage file after merge tool finishes
|
||||
git-gui: Remove space from the end of aspell's reply before processing
|
||||
git-gui: Fix switch statement in lib/merge.tcl
|
||||
git-gui: Show a round number of bytes of large untracked text files
|
||||
git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
|
||||
git-gui: Do not munge conflict marker lines in a normal diff
|
||||
|
||||
Junio C Hamano (4):
|
||||
receive-pack: fix "borrowing from alternate object store" implementation
|
||||
compat/cygwin.c: make runtime detection of lstat/stat lessor impact
|
||||
Stop using compat/regex.c on platforms with working regexp library
|
||||
Update draft release notes to 1.6.1
|
||||
|
||||
Petr Baudis (12):
|
||||
git-gui: Clarify the Remote -> Delete... action
|
||||
git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu
|
||||
git-gui: Add support for adding remotes
|
||||
git-gui: Add support for removing remotes
|
||||
git-gui: mkdir -p when initializing new remote repository
|
||||
git-gui: Use git web--browser for web browsing
|
||||
git-gui: Add Explore Working Copy to the Repository menu
|
||||
git-gui: gui.autoexplore makes explorer to pop up automatically after
|
||||
picking
|
||||
git-gui: Avoid using the term URL when specifying repositories
|
||||
git-gui: Make input boxes in init/clone/open dialogs consistent
|
||||
git-gui: Fix removing non-pushable remotes
|
||||
git-gui: Fix fetching from remotes when adding them
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
git-gui: Show/hide "Sign Off" based on nocommitmsg option
|
||||
|
||||
Tom Preston-Werner (1):
|
||||
connect.c: add a way for git-daemon to pass an error back to client
|
||||
|
||||
@@ -1,172 +0,0 @@
|
||||
Subject: What's in git.git (Nov 2008, #02; Wed, 12)
|
||||
X-maint-at: c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0
|
||||
X-master-at: 171d7661eda111d3e35f6e8097a1a3a07b30026c
|
||||
X-maint-was: 1a9016aae5aa8c468bb2d8d5dd16303d5c005869
|
||||
X-master-was: 6a509a6f7f38906996ac791449d5bcc2f32eef23
|
||||
|
||||
What's in git.git (Nov 2008, #02; Wed, 12)
|
||||
|
||||
maint c14639f (Start 1.6.0.5 cycle)
|
||||
master 171d766 (git.html: Update the links to stale versions)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
BLURB HERE
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Alex Riesen (7):
|
||||
Add mksnpath which allows you to specify the output buffer
|
||||
Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
|
||||
Fix potentially dangerous uses of mkpath and git_path
|
||||
Add git_snpath: a .git path formatting routine with output buffer
|
||||
Fix potentially dangerous use of git_path in ref.c
|
||||
git_pathdup: returns xstrdup-ed copy of the formatted path
|
||||
Use git_pathdup instead of xstrdup(git_path(...))
|
||||
|
||||
Alexandre Julliard (2):
|
||||
checkout: Don't crash when switching away from an invalid branch.
|
||||
git-submodule: Avoid printing a spurious message.
|
||||
|
||||
Christian Couder (2):
|
||||
Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"
|
||||
Documentation: bisect: change a few instances of "git-cmd" to "git cmd"
|
||||
|
||||
Christian Jaeger (1):
|
||||
Git.pm: do not break inheritance
|
||||
|
||||
Clemens Buchacher (2):
|
||||
do not force write of packed refs
|
||||
push: fix local refs update if already up-to-date
|
||||
|
||||
Daniel Lowe (1):
|
||||
Fix non-literal format in printf-style calls
|
||||
|
||||
Jeff King (1):
|
||||
refactor handling of "other" files in ls-files and status
|
||||
|
||||
Johannes Schindelin (1):
|
||||
Fix fetch/pull when run without --update-head-ok
|
||||
|
||||
Junio C Hamano (11):
|
||||
pull: allow "git pull origin $something:$current_branch" into an unborn
|
||||
branch
|
||||
Fix "checkout --track -b newbranch" on detached HEAD
|
||||
reset --hard/read-tree --reset -u: remove unmerged new paths
|
||||
demonstrate breakage of detached checkout with symbolic link HEAD
|
||||
Enhance hold_lock_file_for_{update,append}() API
|
||||
Update draft 1.6.0.4 release notes
|
||||
format-patch documentation: mention the special case of showing a single
|
||||
commit
|
||||
GIT 1.6.0.4
|
||||
Makefile: help people who run 'make check' by mistake
|
||||
checkout: Fix "initial checkout" detection
|
||||
Start 1.6.0.5 cycle
|
||||
|
||||
Matt Kraai (1):
|
||||
Remove the period after the git-check-attr summary
|
||||
|
||||
Mikael Magnusson (1):
|
||||
Document that git-log takes --all-match.
|
||||
|
||||
Miklos Vajna (5):
|
||||
Fix git branch -m for symrefs.
|
||||
rename_ref(): handle the case when the reflog of a ref does not exist
|
||||
Fix git update-ref --no-deref -d.
|
||||
git branch -m: forbid renaming of a symref
|
||||
update-ref --no-deref -d: handle the case when the pointed ref is packed
|
||||
|
||||
Nicolas Pitre (1):
|
||||
Fix pack.packSizeLimit and --max-pack-size handling
|
||||
|
||||
Quy Tonthat (1):
|
||||
Update RPM spec for the new location of git-cvsserver.
|
||||
|
||||
Stefan Naewe (1):
|
||||
git ls-remote: make usage string match manpage
|
||||
|
||||
Yann Dirson (1):
|
||||
Add reference for status letters in documentation.
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alex Riesen (1):
|
||||
Fix potentially dangerous uses of mkpath and git_path
|
||||
|
||||
Alexander Gavrilov (5):
|
||||
builtin-blame: Reencode commit messages according to git-log rules.
|
||||
Windows: Make OpenSSH properly detect tty detachment.
|
||||
gitweb: Use single implementation of export_ok check.
|
||||
gitweb: Add a per-repository authorization hook.
|
||||
gitweb: Fix mod_perl support.
|
||||
|
||||
Brian Downing (2):
|
||||
Always initialize xpparam_t to 0
|
||||
Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Christian Couder (1):
|
||||
bisect: fix missing "exit"
|
||||
|
||||
Daniel Lowe (1):
|
||||
Fix non-literal format in printf-style calls
|
||||
|
||||
David M. Syzdek (1):
|
||||
autoconf: Add link tests to each AC_CHECK_FUNC() test
|
||||
|
||||
David Symonds (1):
|
||||
git-diff: Add --staged as a synonym for --cached.
|
||||
|
||||
Giuseppe Bilotta (5):
|
||||
gitweb: parse project/action/hash_base:filename PATH_INFO
|
||||
gitweb: generate project/action/hash URLs
|
||||
gitweb: use_pathinfo filenames start with /
|
||||
gitweb: parse parent..current syntax from PATH_INFO
|
||||
gitweb: generate parent..current URLs
|
||||
|
||||
Jeff King (1):
|
||||
t5400: expect success for denying deletion
|
||||
|
||||
John Chapman (2):
|
||||
git-p4: Support purged files and optimize memory usage
|
||||
git-p4: Cache git config for performance
|
||||
|
||||
Junio C Hamano (6):
|
||||
Fix reading of cloud tags
|
||||
rebase-i-p: minimum fix to obvious issues
|
||||
git-rebase--interactive.sh: comparision with == is bashism
|
||||
Update draft release notes to 1.6.1
|
||||
Update draft release notes to 1.6.1
|
||||
git.html: Update the links to stale versions
|
||||
|
||||
Markus Heidelberg (1):
|
||||
Makefile: add install-man rules (quick and normal)
|
||||
|
||||
Miklos Vajna (1):
|
||||
parse-opt: migrate builtin-checkout-index.
|
||||
|
||||
Nicolas Pitre (5):
|
||||
index-pack: rationalize delta resolution code
|
||||
index-pack: smarter memory usage during delta resolution
|
||||
fix multiple issues in index-pack
|
||||
improve index-pack tests
|
||||
index-pack: don't leak leaf delta result
|
||||
|
||||
Pete Harlan (2):
|
||||
contrib/hooks/post-receive-email: Put rev display in separate function
|
||||
contrib/hooks/post-receive-email: Make revision display configurable
|
||||
|
||||
René Scharfe (3):
|
||||
blame: inline get_patch()
|
||||
add xdi_diff_hunks() for callers that only need hunk lengths
|
||||
blame: use xdi_diff_hunks(), get rid of struct patch
|
||||
|
||||
Stephen Haberman (7):
|
||||
rebase-i-p: test to exclude commits from todo based on its parents
|
||||
rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
|
||||
rebase-i-p: delay saving current-commit to REWRITTEN if squashing
|
||||
rebase-i-p: fix 'no squashing merges' tripping up non-merges
|
||||
rebase-i-p: only list commits that require rewriting in todo
|
||||
rebase-i-p: do not include non-first-parent commits touching UPSTREAM
|
||||
rebase-i-p: if todo was reordered use HEAD as the rewritten parent
|
||||
|
||||
@@ -1,164 +0,0 @@
|
||||
Subject: What's in git.git (Nov 2008, #03; Sat, 15)
|
||||
X-maint-at: 9e77353e0ea6e9e6d88ad1943570afb526d54a16
|
||||
X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
|
||||
X-maint-was: c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0
|
||||
X-master-was: 171d7661eda111d3e35f6e8097a1a3a07b30026c
|
||||
|
||||
What's in git.git (Nov 2008, #03; Sat, 15)
|
||||
|
||||
maint 9e77353 (Documentation: git-svn: fix example for centralized SVN clone)
|
||||
master ea4f2bd (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Consider that the tip of 'master' is 1.6.1-rc0, although I haven't tagged
|
||||
it as such. There are a handful more topics cooking in 'next' and they
|
||||
are worthy of being in 1.6.1 final.
|
||||
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Brandon Casey (1):
|
||||
revision.c: use proper data type in call to sizeof() within xrealloc
|
||||
|
||||
Christian Couder (1):
|
||||
Documentation: fix links to "everyday.html"
|
||||
|
||||
Jan Krüger (1):
|
||||
Documentation: git-svn: fix example for centralized SVN clone
|
||||
|
||||
Linus Torvalds (1):
|
||||
date/time: do not get confused by fractional seconds
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alexander Gavrilov (14):
|
||||
gitk: Allow forcing branch creation if it already exists
|
||||
gitk: Fix file list context menu for merge commits
|
||||
gitk: Allow starting gui blame for a specific line
|
||||
gitk: Add Return and Escape bindings to dialogs
|
||||
gitk: Make gitk dialog windows transient
|
||||
gitk: Make cherry-pick call git-citool on conflicts
|
||||
gitk: Implement a user-friendly Edit View dialog
|
||||
git-gui: Fix focus transition in the blame viewer.
|
||||
git-gui: Add the Show SSH Key item to the clone dialog.
|
||||
git-gui: Request blame metadata in utf-8.
|
||||
gitk: Add accelerators to frequently used menu commands
|
||||
gitk: Fix transient windows on Win32 and MacOS
|
||||
gitk: Fix commit encoding support
|
||||
Documentation: New GUI configuration and command-line options.
|
||||
|
||||
Brandon Casey (10):
|
||||
t7700: demonstrate mishandling of objects in packs with a .keep file
|
||||
packed_git: convert pack_local flag into a bitfield and add pack_keep
|
||||
pack-objects: new option --honor-pack-keep
|
||||
repack: don't repack local objects in packs with .keep file
|
||||
repack: do not fall back to incremental repacking with [-a|-A]
|
||||
builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
|
||||
t7700: demonstrate mishandling of loose objects in an alternate ODB
|
||||
sha1_file.c: split has_loose_object() into local and non-local
|
||||
counterparts
|
||||
pack-objects: extend --local to mean ignore non-local loose objects too
|
||||
t7700: test that 'repack -a' packs alternate packed objects
|
||||
|
||||
Brian Gernhardt (1):
|
||||
Avoid using non-portable `echo -n` in tests.
|
||||
|
||||
David M. Syzdek (4):
|
||||
Build: add NO_UINTMAX_T to support ancient systems
|
||||
Add Makefile check for FreeBSD 4.9-SECURITY
|
||||
Make Pthread link flags configurable
|
||||
Add autoconf tests for pthreads
|
||||
|
||||
Davide Libenzi (1):
|
||||
xdiff: give up scanning similar lines early
|
||||
|
||||
Deskin Miller (2):
|
||||
git-svn: proper detection of bare repositories
|
||||
git-svn: proper detection of bare repositories
|
||||
|
||||
Eric Wong (4):
|
||||
git-svn: don't escape tilde ('~') for http(s) URLs
|
||||
git-svn: respect i18n.commitencoding config
|
||||
git-svn: don't escape tilde ('~') for http(s) URLs
|
||||
git-svn: respect i18n.commitencoding config
|
||||
|
||||
Giuseppe Bilotta (3):
|
||||
gitweb: make the supported snapshot formats array global
|
||||
gitweb: retrieve snapshot format from PATH_INFO
|
||||
gitweb: embed snapshot format parameter in PATH_INFO
|
||||
|
||||
Jakub Narebski (1):
|
||||
gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Jeff King (11):
|
||||
diff: add missing static declaration
|
||||
document the diff driver textconv feature
|
||||
refactor userdiff textconv code
|
||||
userdiff: require explicitly allowing textconv
|
||||
only textconv regular files
|
||||
wt-status: load diff ui config
|
||||
add userdiff textconv tests
|
||||
enable textconv for diff in verbose status/commit
|
||||
t5516: refactor oddball tests
|
||||
receive-pack: detect push to current branch of non-bare repo
|
||||
commit: Fix stripping of patch in verbose mode.
|
||||
|
||||
Junio C Hamano (3):
|
||||
t5303: work around printf breakage in dash
|
||||
t5303: fix printf format string for portability
|
||||
Update draft release notes to 1.6.1
|
||||
|
||||
Linus Torvalds (4):
|
||||
Add a 'source' decorator for commits
|
||||
revision: make tree comparison functions take commits rather than trees
|
||||
Make '--decorate' set an explicit 'show_decorations' flag
|
||||
revision traversal: '--simplify-by-decoration'
|
||||
|
||||
Marten Svanfeldt (dev) (2):
|
||||
Git.pm: Make _temp_cache use the repository directory
|
||||
git-svn: Update git-svn to use the ability to place temporary files
|
||||
within repository directory
|
||||
|
||||
Martin Koegler (1):
|
||||
git push: Interpret $GIT_DIR/branches in a Cogito compatible way
|
||||
|
||||
Miklos Vajna (4):
|
||||
Implement git remote rename
|
||||
remote: add a new 'origin' variable to the struct
|
||||
git-remote rename: migrate from remotes/ and branches/
|
||||
git-remote: document the migration feature of the rename subcommand
|
||||
|
||||
Nanako Shiraishi (2):
|
||||
Document "git log --source"
|
||||
Document "git log --simplify-by-decoration"
|
||||
|
||||
Nicolas Pitre (9):
|
||||
close another possibility for propagating pack corruption
|
||||
better validation on delta base object offsets
|
||||
make unpack_object_header() non fatal
|
||||
make packed_object_info() resilient to pack corruptions
|
||||
make check_object() resilient to pack corruptions
|
||||
make find_pack_revindex() aware of the nasty world
|
||||
pack-objects: allow "fixing" a corrupted pack without a full repack
|
||||
extend test coverage for latest pack corruption resilience improvements
|
||||
pack-objects: don't leak pack window reference when splitting packs
|
||||
|
||||
Paul Mackerras (8):
|
||||
gitk: Fix some off-by-one errors in computing which line to blame
|
||||
gitk: Add a menu item to show where a given line comes from
|
||||
gitk: Make the background color of marked lines configurable
|
||||
gitk: Unify handling of merge diffs with normal 2-way diffs
|
||||
gitk: Make "show origin of this line" work on fake commits
|
||||
gitk: Cope with unmerged files in local changes
|
||||
gitk: Improve cherry-pick error handling
|
||||
gitk: Fix linehtag undefined error with file highlighting
|
||||
|
||||
Samuel Tardieu (2):
|
||||
tag: Check that options are only allowed in the appropriate mode
|
||||
tag: Add more tests about mixing incompatible modes and options
|
||||
|
||||
Santi Béjar (1):
|
||||
rev-list documentation: clarify the two parts of history simplification
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
Subject: What's in git.git (Nov 2008, #04; Wed, 26)
|
||||
X-maint-at: 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0
|
||||
X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
|
||||
X-maint-was: 9e77353e0ea6e9e6d88ad1943570afb526d54a16
|
||||
X-master-was: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
|
||||
|
||||
What's in git.git (Nov 2008, #04; Wed, 26)
|
||||
|
||||
maint 5aa3bdd (Merge branch 'mm/maint-sort-config-doc' into maint)
|
||||
master aa14a0c (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
I suspect many people especially the ones in the US will be in vacation
|
||||
mode and not near their keyboards til next week, but here is an update.
|
||||
|
||||
There are a few 'maint' material cooking in 'next' and v1.6.0.5 should be
|
||||
tagged at the end of the month.
|
||||
|
||||
At around the same time I am hoping majority of topics cooking in 'next'
|
||||
tonight can be in 'master' and we can tagl v1.6.1-rc1.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Bryan Drewery (1):
|
||||
Fix misleading wording for git-cherry-pick
|
||||
|
||||
Junio C Hamano (3):
|
||||
builtin-ls-files.c: coding style fix.
|
||||
Teach ls-files --with-tree=<tree> to work with options other than -c
|
||||
Teach "git diff" to honour --[no-]ext-diff
|
||||
|
||||
Matt McCutchen (1):
|
||||
config.txt: alphabetize configuration sections
|
||||
|
||||
Stefan Naewe (1):
|
||||
request-pull: make usage string match manpage
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alex Riesen (2):
|
||||
Fix handle leak in sha1_file/unpack_objects if there were damaged object
|
||||
data
|
||||
Fix t4030-diff-textconv.sh
|
||||
|
||||
Alexander Gavrilov (6):
|
||||
git-gui: Implement system-wide configuration handling.
|
||||
git-gui: Fix the after callback execution in rescan.
|
||||
git-gui: Add a Tools menu for arbitrary commands.
|
||||
git-gui: Allow Tools request arguments from the user.
|
||||
git-gui: Implement automatic rescan after Tool execution.
|
||||
git-gui: Fix the search bar destruction handler.
|
||||
|
||||
Alexandre Julliard (9):
|
||||
git.el: Improve error handling for commits.
|
||||
git.el: Remove the env parameter in git-call-process and
|
||||
git-call-process-string.
|
||||
git.el: Simplify handling of merge heads in the commit log-edit buffer.
|
||||
git.el: Properly handle merge commits in git-amend-commit.
|
||||
git.el: Fix git-amend-commit to support amending an initial commit.
|
||||
git.el: Never clear the status buffer, only update the files.
|
||||
git.el: Add an insert file command.
|
||||
git.el: Add possibility to mark files directly in
|
||||
git-update-status-files.
|
||||
git.el: Allow to commit even if there are no marked files.
|
||||
|
||||
Brandon Casey (1):
|
||||
repack: only unpack-unreachable if we are deleting redundant packs
|
||||
|
||||
Cheng Renquan (1):
|
||||
git-remote: match usage string with the manual pages
|
||||
|
||||
Christian Couder (2):
|
||||
Documentation: user-manual: add information about "git help" at the
|
||||
beginning
|
||||
Documentation: tutorial: add information about "git help" at the
|
||||
beginning
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
git-gui: try to provide a window icon under X
|
||||
|
||||
Jeff King (3):
|
||||
define empty tree sha1 as a macro
|
||||
wt-status: refactor initial commit printing
|
||||
status: show "-v" diff even for initial commit
|
||||
|
||||
Jim Meyering (1):
|
||||
xdiff-interface.c: remove 10 duplicated lines
|
||||
|
||||
Joey Hess (1):
|
||||
sha1_file: avoid bogus "file exists" error message
|
||||
|
||||
Junio C Hamano (1):
|
||||
builtin-remote.c: plug a small memory leak in
|
||||
get_one_remote_for_updates()
|
||||
|
||||
Linus Torvalds (1):
|
||||
Fix machine-parseability of 'git log --source'
|
||||
|
||||
Marcel Koeppen (1):
|
||||
t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with()
|
||||
compatible with OSX sed
|
||||
|
||||
Mark Burton (2):
|
||||
Documentation: rev-list-options.txt: added --branches, --tags &
|
||||
--remotes.
|
||||
git-commit.txt - mention that files listed on the command line must be
|
||||
known to git.
|
||||
|
||||
Miklos Vajna (3):
|
||||
builtin-branch: use strbuf in delete_branches()
|
||||
builtin-branch: use strbuf in fill_tracking_info()
|
||||
builtin-branch: use strbuf in rename_branch()
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
Update the po template
|
||||
|
||||
Trent Piepho (1):
|
||||
send-email: Fix Pine address book parsing
|
||||
|
||||
@@ -1,161 +0,0 @@
|
||||
Subject: What's in git.git (Dec 2008, #01; Tue, 02)
|
||||
X-maint-at: 25e30fa08e687d584d9dd87d13acf84bb1e1858c
|
||||
X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10
|
||||
X-maint-was: 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0
|
||||
X-master-was: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
|
||||
|
||||
What's in git.git (Dec 2008, #01; Tue, 02)
|
||||
|
||||
maint 25e30fa (User's Manual: remove duplicated url at the end of Appendix B)
|
||||
master 757c7f6 (git-stash: use git rev-parse -q)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
We'll probably have 1.6.0.5 by the end of this week.
|
||||
|
||||
The tip of the 'master' branch is at 1.6.1-rc1 with a few more fixes.
|
||||
Hopefully we will have the final 1.6.1 by the end of the year.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Joey Hess (1):
|
||||
sha1_file: avoid bogus "file exists" error message
|
||||
|
||||
Johannes Schindelin (1):
|
||||
fast-export: use an unsorted string list for extra_refs
|
||||
|
||||
Junio C Hamano (1):
|
||||
Update draft release notes to 1.6.0.5
|
||||
|
||||
Martin Koegler (1):
|
||||
git push: Interpret $GIT_DIR/branches in a Cogito compatible way
|
||||
|
||||
Matt McCutchen (1):
|
||||
git checkout: don't warn about unborn branch if -f is already passed
|
||||
|
||||
Miklos Vajna (2):
|
||||
Add new testcase to show fast-export does not always exports all tags
|
||||
User's Manual: remove duplicated url at the end of Appendix B
|
||||
|
||||
Nguyễn Thái Ngọc Duy (1):
|
||||
generate-cmdlist.sh: avoid selecting synopsis at wrong place
|
||||
|
||||
Pete Wyckoff (1):
|
||||
git-p4: fix keyword-expansion regex
|
||||
|
||||
Ralf Wildenhues (1):
|
||||
Fix typos in the documentation.
|
||||
|
||||
SZEDER Gábor (2):
|
||||
bash: remove dashed command leftovers
|
||||
bash: offer refs instead of filenames for 'git revert'
|
||||
|
||||
Sam Vilain (1):
|
||||
sha1_file.c: resolve confusion EACCES vs EPERM
|
||||
|
||||
Samuel Tardieu (2):
|
||||
tag: Check that options are only allowed in the appropriate mode
|
||||
tag: Add more tests about mixing incompatible modes and options
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alexander Gavrilov (3):
|
||||
gitk: Avoid handling the Return key twice in Add Branch
|
||||
gitk: Make line origin search update the busy status
|
||||
gitk: Add a menu option to start git gui
|
||||
|
||||
Cheng Renquan (1):
|
||||
git-remote: add verbose mode to git remote update
|
||||
|
||||
Christian Couder (4):
|
||||
git-gui: french translation update
|
||||
bisect: teach "skip" to accept special arguments like "A..B"
|
||||
bisect: fix "git bisect skip <commit>" and add tests cases
|
||||
Documentation: describe how to "bisect skip" a range of commits
|
||||
|
||||
Christian Stimming (1):
|
||||
gitk: Update German translation
|
||||
|
||||
Giuseppe Bilotta (2):
|
||||
gitweb: make gitweb_check_feature a boolean wrapper
|
||||
Update comment on gitweb_check/get_feature
|
||||
|
||||
Johannes Schindelin (1):
|
||||
Document levenshtein.c
|
||||
|
||||
Johannes Sixt (2):
|
||||
compat/mingw.c: Teach mingw_rename() to replace read-only files
|
||||
t4030-diff-textconv: Make octal escape sequence more portable
|
||||
|
||||
Junio C Hamano (6):
|
||||
gitweb: fix 'ctags' feature check and others
|
||||
gitweb: rename gitweb_check_feature to gitweb_get_feature
|
||||
send-email: do not reverse the command line arguments
|
||||
Include git-gui--askpass in git-gui RPM package
|
||||
GIT 1.6.1-rc1
|
||||
Makefile: introduce NO_PTHREADS
|
||||
|
||||
Linus Torvalds (3):
|
||||
Add cache preload facility
|
||||
Fix index preloading for racy dirty case
|
||||
Add backslash to list of 'crud' characters in real name
|
||||
|
||||
Mark Burton (1):
|
||||
git-gui: Teach start_push_anywhere_action{} to notice when remote is a
|
||||
mirror.
|
||||
|
||||
Michele Ballabio (1):
|
||||
git gui: update Italian translation
|
||||
|
||||
Miklos Vajna (5):
|
||||
Update Hungarian translation. 100% completed.
|
||||
builtin-clone: use strbuf in guess_dir_name()
|
||||
builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
|
||||
builtin_clone: use strbuf in cmd_clone()
|
||||
git-stash: use git rev-parse -q
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
git-gui: update Japanese translation
|
||||
|
||||
Paul Mackerras (6):
|
||||
gitk: Index line[hnd]tag arrays by id rather than row number
|
||||
gitk: Fix switch statement in parseviewargs
|
||||
gitk: Show local changes properly when we have a path limit
|
||||
gitk: Fix context menu items for generating diffs when in tree mode
|
||||
gitk: Highlight only when search type is "containing:".
|
||||
gitk: Fix bug in accessing undefined "notflag" variable
|
||||
|
||||
Peter Krefting (1):
|
||||
Updated Swedish translation (514t0f0u).
|
||||
|
||||
Pierre Habouzit (4):
|
||||
git send-email: make the message file name more specific.
|
||||
git send-email: interpret unknown files as revision lists
|
||||
git send-email: add --annotate option
|
||||
git send-email: ask less questions when --compose is used.
|
||||
|
||||
Ralf Wildenhues (1):
|
||||
Fix typos in the documentation.
|
||||
|
||||
René Scharfe (6):
|
||||
add strbuf_expand_dict_cb(), a helper for simple cases
|
||||
merge-recursive: use strbuf_expand() instead of interpolate()
|
||||
daemon: use strbuf_expand() instead of interpolate()
|
||||
daemon: inline fill_in_extra_table_entries()
|
||||
daemon: deglobalize variable 'directory'
|
||||
remove the unused files interpolate.c and interpolate.h
|
||||
|
||||
SZEDER Gábor (1):
|
||||
bash: complete full refs
|
||||
|
||||
Samuel Tardieu (1):
|
||||
Fix deletion of last character in levenshtein distance
|
||||
|
||||
Scott Chacon (1):
|
||||
Add a built-in alias for 'stage' to the 'add' command
|
||||
|
||||
Tuncer Ayaz (2):
|
||||
Teach/Fix pull/fetch -q/-v options
|
||||
Retain multiple -q/-v occurrences in git pull
|
||||
|
||||
@@ -1,146 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Dec 2008, #02; Sun, 14)
|
||||
X-maint-at: 544ddb045a4bd49da9ffc1d9da80bdc0d71b2518
|
||||
X-master-at: 7e76aba317b690932c8236311219b0faf97f1571
|
||||
X-maint-was: 25e30fa08e687d584d9dd87d13acf84bb1e1858c
|
||||
X-master-was: 757c7f60a78004fc3d0ea62f44320d54ef430c10
|
||||
|
||||
What's in git.git (Dec 2008, #02; Sun, 14)
|
||||
|
||||
maint 544ddb0 (git-config.txt: fix a typo)
|
||||
master 7e76aba (builtin-commit: remove unused message variable)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
There are a handful fixes since 1.6.1-rc2 on 'master' and I am hoping that
|
||||
we can do -rc3 later today, and declare the 1.6.1 final on the 20th or
|
||||
so.
|
||||
|
||||
----------------------------------------------------------------
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Brandon Casey (11):
|
||||
t7700: demonstrate mishandling of objects in packs with a .keep file
|
||||
packed_git: convert pack_local flag into a bitfield and add pack_keep
|
||||
pack-objects: new option --honor-pack-keep
|
||||
repack: don't repack local objects in packs with .keep file
|
||||
repack: do not fall back to incremental repacking with [-a|-A]
|
||||
builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
|
||||
t7700: demonstrate mishandling of loose objects in an alternate ODB
|
||||
sha1_file.c: split has_loose_object() into local and non-local
|
||||
counterparts
|
||||
pack-objects: extend --local to mean ignore non-local loose objects too
|
||||
t7700: test that 'repack -a' packs alternate packed objects
|
||||
repack: only unpack-unreachable if we are deleting redundant packs
|
||||
|
||||
Davide Libenzi (1):
|
||||
xdiff: give up scanning similar lines early
|
||||
|
||||
Deskin Miller (1):
|
||||
git-svn: Make following parents atomic
|
||||
|
||||
Jakub Narebski (1):
|
||||
gitweb: Make project specific override for 'grep' feature work
|
||||
|
||||
Jeff King (2):
|
||||
commit: Fix stripping of patch in verbose mode.
|
||||
tag: delete TAG_EDITMSG only on successful tag
|
||||
|
||||
Jim Meyering (1):
|
||||
git-config.txt: fix a typo
|
||||
|
||||
Johannes Sixt (1):
|
||||
compat/mingw.c: Teach mingw_rename() to replace read-only files
|
||||
|
||||
Junio C Hamano (2):
|
||||
GIT 1.6.0.5
|
||||
work around Python warnings from AsciiDoc
|
||||
|
||||
Linus Torvalds (1):
|
||||
fsck: reduce stack footprint
|
||||
|
||||
Matt McCutchen (1):
|
||||
"git diff <tree>{3,}": do not reverse order of arguments
|
||||
|
||||
Miklos Vajna (1):
|
||||
http.c: use 'git_config_string' to get 'curl_http_proxy'
|
||||
|
||||
Nicolas Pitre (1):
|
||||
make sure packs to be replaced are closed beforehand
|
||||
|
||||
Thomas Rast (1):
|
||||
fetch-pack: Avoid memcpy() with src==dst
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alex Riesen (3):
|
||||
Make some of fwrite/fclose/write/close failures visible
|
||||
Make chdir failures visible
|
||||
Report symlink failures in merge-recursive
|
||||
|
||||
Alexander Potashev (2):
|
||||
Fix typos in documentation
|
||||
Fix typo in comment in builtin-add.c
|
||||
|
||||
Alexey Borzenkov (1):
|
||||
Define linkgit macro in [macros] section
|
||||
|
||||
Brandon Casey (1):
|
||||
git-branch: display sha1 on branch deletion
|
||||
|
||||
Deskin Miller (1):
|
||||
git-svn: Make branch use correct svn-remote
|
||||
|
||||
Jakub Narebski (2):
|
||||
gitweb: Fix handling of non-ASCII characters in inserted HTML files
|
||||
gitweb: Fix bug in insert_file() subroutine
|
||||
|
||||
Jeff King (6):
|
||||
add stage to gitignore
|
||||
reorder ALLOW_TEXTCONV option setting
|
||||
diff: allow turning on textconv explicitly for plumbing
|
||||
diff: fix handling of binary rewrite diffs
|
||||
diff: respect textconv in rewrite diffs
|
||||
rebase: improve error messages about dirty state
|
||||
|
||||
Junio C Hamano (16):
|
||||
builtin-rm.c: explain and clarify the "local change" logic
|
||||
git add --intent-to-add: fix removal of cached emptiness
|
||||
git add --intent-to-add: do not let an empty blob be committed by
|
||||
accident
|
||||
Install git-stage in exec-path
|
||||
git-am --whitespace: do not lose the command line option
|
||||
git-am: propagate -C<n>, -p<n> options as well
|
||||
git-am: propagate --3way options as well
|
||||
Test that git-am does not lose -C/-p/--whitespace options
|
||||
git-am: rename apply_opt_extra file to apply-opt
|
||||
Update draft release notes to 1.6.1
|
||||
Update draft release notes for 1.6.1
|
||||
Revert "git-stash: use git rev-parse -q"
|
||||
Point "stale" 1.6.0.5 documentation from the main git documentation page
|
||||
builtin-checkout.c: check error return from read_cache()
|
||||
read-cache.c: typofix in comment
|
||||
Fix t4031
|
||||
|
||||
Markus Heidelberg (1):
|
||||
builtin-commit: remove unused message variable
|
||||
|
||||
Miklos Vajna (5):
|
||||
filter-branch: use git rev-parse -q
|
||||
lost-found: use git rev-parse -q
|
||||
pull: use git rev-parse -q
|
||||
rebase: use git rev-parse -q
|
||||
submodule: use git rev-parse -q
|
||||
|
||||
Nguyễn Thái Ngọc Duy (1):
|
||||
Extend index to save more flags
|
||||
|
||||
Ralf Wildenhues (1):
|
||||
Improve language in git-merge.txt and related docs
|
||||
|
||||
Tor Arvid Lund (2):
|
||||
git-p4: Fix bug in p4Where method.
|
||||
git-p4: Fix regression in p4Where method.
|
||||
|
||||
@@ -1,126 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
|
||||
Johannes Sixt <j6t@kdbg.org>,
|
||||
Paul Mackerras <paulus@samba.org>,
|
||||
Robin Rosenberg <robin.rosenberg@dewire.com>,
|
||||
"Boyd Stephen Smith Jr." <bss@iguanasuicide.net>
|
||||
Subject: What's in git.git (Dec 2008, #03; Sun, 21)
|
||||
X-maint-at: 718258e256b74622aa55f5ee0cb9cff4cce6bf9f
|
||||
X-master-at: b3eae84dc10e452add0e79c7373ceee16f73f7f0
|
||||
X-maint-was: 718258e256b74622aa55f5ee0cb9cff4cce6bf9f
|
||||
X-master-was: 7e76aba317b690932c8236311219b0faf97f1571
|
||||
|
||||
What's in git.git (Dec 2008, #03; Sun, 21)
|
||||
|
||||
maint 718258e (GIT 1.6.0.6)
|
||||
master b3eae84 (Documentation/git-show-branch: work around "single quote" typesetting glitch)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
The 'maint' branch is at 1.6.0.6, which hopefully will be the last
|
||||
maintenance release until 1.6.1 final.
|
||||
|
||||
Earlier I said I'd like to have 1.6.1 final this weekend, but I'd rather
|
||||
play safe and tag -rc4 tonight (gee, it is already 04:00am), and leave the
|
||||
final 1.6.0 as Christmas present to git users.
|
||||
|
||||
* Paul has one patch on his gitk branch I have fetched but not merged yet;
|
||||
waiting for his go-ahead.
|
||||
|
||||
* I am undecided whether I should include the "rebase -i -p" patch from
|
||||
j6t in 1.6.1 and have been waiting for comments from Dscho.
|
||||
|
||||
* A documentation patch from Boyd Stephen Smith Jr. to add a reference to
|
||||
the new HowTo page from git-revert manpage and an additional warning to
|
||||
git-revert from Robin Rosenberg are still not in yet, but I would like
|
||||
to have them with updates in 1.6.1 final.
|
||||
|
||||
Other than that, the 'master' I am pusing out is pretty much it for
|
||||
1.6.1.
|
||||
|
||||
----------------------------------------------------------------
|
||||
|
||||
* The 'master' branch has these since the last announcement.
|
||||
|
||||
Alexander Gavrilov (3):
|
||||
git-gui: Fix handling of relative paths in blame.
|
||||
git-gui: Fix commit encoding handling.
|
||||
Documentation: Describe git-gui Tools menu configuration options.
|
||||
|
||||
Arjen Laarhoven (1):
|
||||
Enable threaded delta search on Mac OS X/Darwin
|
||||
|
||||
Christian Stimming (1):
|
||||
git-gui: Update German (completed) translation.
|
||||
|
||||
Fredrik Skolmli (1):
|
||||
git-gui: Starting translation for Norwegian
|
||||
|
||||
Johannes Schindelin (2):
|
||||
Get rid of the last remnants of GIT_CONFIG_LOCAL
|
||||
git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
|
||||
|
||||
Junio C Hamano (6):
|
||||
gitweb: do not run "git diff" that is Porcelain
|
||||
make_absolute_path(): check bounds when seeing an overlong symlink
|
||||
builtin-blame.c: use strbuf_readlink()
|
||||
combine-diff.c: use strbuf_readlink()
|
||||
Make sure lockfiles are unlocked when dying on SIGPIPE
|
||||
send-email: futureproof split_addrs() sub
|
||||
|
||||
Kirill A. Korinskiy (1):
|
||||
Remove the requirement opaquelocktoken uri scheme
|
||||
|
||||
Lee Marlow (2):
|
||||
bash completion: Sort config completion variables
|
||||
bash completion: Sync config variables with their man pages
|
||||
|
||||
Linus Torvalds (5):
|
||||
Add generic 'strbuf_readlink()' helper function
|
||||
Make 'ce_compare_link()' use the new 'strbuf_readlink()'
|
||||
Make 'index_path()' use 'strbuf_readlink()'
|
||||
Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'
|
||||
Make 'prepare_temp_file()' ignore st_size for symlinks
|
||||
|
||||
Marcel M. Cary (1):
|
||||
git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir
|
||||
|
||||
Markus Heidelberg (5):
|
||||
Documentation: fix description for enabling hooks
|
||||
doc/git-reset: add reference to git-stash
|
||||
Documentation: sync example output with git output
|
||||
Documentation: fix typos, grammar, asciidoc syntax
|
||||
Documentation/git-show-branch: work around "single quote" typesetting
|
||||
glitch
|
||||
|
||||
Michael J Gruber (1):
|
||||
test overlapping ignore patterns
|
||||
|
||||
Michele Ballabio (1):
|
||||
git gui: update Italian translation
|
||||
|
||||
Miklos Vajna (3):
|
||||
git-gui: Update Hungarian translation for 0.12
|
||||
git-daemon documentation: use {tilde}
|
||||
githooks documentation: add a note about the +x mode
|
||||
|
||||
Nanako Shiraishi (3):
|
||||
git-gui: Update Japanese translation for 0.12
|
||||
Clarify documentation of "git checkout <tree-ish> paths" syntax
|
||||
Add a documentat on how to revert a faulty merge
|
||||
|
||||
Peter Krefting (2):
|
||||
git-gui: Updated Swedish translation (515t0f0u).
|
||||
git-gui: Fixed typos in Swedish translation.
|
||||
|
||||
René Scharfe (3):
|
||||
Fix type-mismatch compiler warning from diff_populate_filespec()
|
||||
connect.c: stricter port validation, silence compiler warning
|
||||
fast-import.c: stricter strtoul check, silence compiler warning
|
||||
|
||||
Shawn O. Pearce (2):
|
||||
git-gui: Update po template to include 'Mirroring %s' message
|
||||
git-gui 0.12
|
||||
|
||||
YONETANI Tomokazu (1):
|
||||
git-fast-import possible memory corruption problem
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Dec 2008, #04; Mon, 29)
|
||||
X-maint-at: 936b7057e8401665a2d106e8de018561db6333fe
|
||||
X-master-at: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf
|
||||
X-maint-was: 8104ebfe8276657ee803cca7eb8665a78cf3ef83
|
||||
X-master-was: b3eae84dc10e452add0e79c7373ceee16f73f7f0
|
||||
|
||||
What's in git.git (Dec 2008, #04; Mon, 29)
|
||||
|
||||
maint 936b705 (Prepare for v1.6.1.1 maintenance release)
|
||||
master c32f76f (Merge branch 'lt/reset-merge')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
BLURB HERE
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Adeodato Simó (2):
|
||||
git-shortlog.txt: improve documentation about .mailmap files
|
||||
git-send-email.txt: move --format-patch paragraph to a proper location
|
||||
|
||||
Devin Doucette (1):
|
||||
gitweb: Fix export check in git_get_projects_list
|
||||
|
||||
Junio C Hamano (1):
|
||||
Prepare for v1.6.1.1 maintenance release
|
||||
|
||||
René Scharfe (7):
|
||||
daemon: handle freopen() failure
|
||||
daemon: cleanup: replace loop with if
|
||||
daemon: cleanup: factor out xstrdup_tolower()
|
||||
merge-file: handle freopen() failure
|
||||
pretty: factor out skip_empty_lines()
|
||||
pretty: factor out format_subject()
|
||||
pretty: support multiline subjects with format:
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
describe: Avoid unnecessary warning when using --all
|
||||
|
||||
jidanni@jidanni.org (1):
|
||||
Documentation/diff-options.txt: unify options
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Johannes Schindelin (1):
|
||||
Force t5302 to use a single thread
|
||||
|
||||
Junio C Hamano (2):
|
||||
Document "git-reset --merge"
|
||||
Start 1.6.2 cycle
|
||||
|
||||
Linus Torvalds (1):
|
||||
Add 'merge' mode to 'git reset'
|
||||
|
||||
Nicolas Pitre (2):
|
||||
autodetect number of CPUs by default when using threads
|
||||
pack-objects: don't use too many threads with few objects
|
||||
|
||||
Teemu Likonen (2):
|
||||
Fix the building of user-manual.texi and gitman.texi documents
|
||||
Fix the building of gitman.info document
|
||||
|
||||
@@ -1,168 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jan 2009, #01; Wed, 14)
|
||||
X-maint-at: 4f8b8992ef0c009822cdca18d32ddf3a124ee284
|
||||
X-master-at: 3cf3b838c7b379824c68ee87799aaaa9028b36cd
|
||||
X-maint-was: 936b7057e8401665a2d106e8de018561db6333fe
|
||||
X-master-was: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf
|
||||
|
||||
What's in git.git (Jan 2009, #01; Wed, 14)
|
||||
|
||||
maint 4f8b899 (Merge branch 'maint-1.6.0' into maint)
|
||||
master 3cf3b83 (Update 1.6.2 draft release notes)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Many topics graduated to 'master' and I updated the draft release notes
|
||||
for 1.6.2.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Clemens Buchacher (1):
|
||||
modify/delete conflict resolution overwrites untracked file
|
||||
|
||||
Felipe Contreras (1):
|
||||
fast-import: Cleanup mode setting.
|
||||
|
||||
Henrik Austad (2):
|
||||
Use capitalized names where appropriate
|
||||
Be consistent in switch usage for tar
|
||||
|
||||
Jay Soffian (1):
|
||||
Git.pm: call Error::Simple() properly
|
||||
|
||||
Joey Hess (1):
|
||||
README: tutorial.txt is now called gittutorial.txt
|
||||
|
||||
Johannes Schindelin (1):
|
||||
merge-recursive: mark rename/delete conflict as unmerged
|
||||
|
||||
Junio C Hamano (3):
|
||||
merge-recursive: do not clobber untracked working tree garbage
|
||||
builtin-apply: prevent non-explicit permission changes
|
||||
git checkout: do not allow switching to a tree-ish that is not a commit
|
||||
|
||||
Kirill A. Korinskiy (1):
|
||||
http-push: support full URI in handle_remote_ls_ctx()
|
||||
|
||||
Markus Heidelberg (1):
|
||||
doc/git-send-email: mention sendemail.cc config variable
|
||||
|
||||
Miklos Vajna (1):
|
||||
fast-export: print usage when no options specified
|
||||
|
||||
Pierre Habouzit (1):
|
||||
Avoid spurious error messages on error mistakes.
|
||||
|
||||
jidanni@jidanni.org (3):
|
||||
Documentation/git-tag.txt: minor typo and grammar fix
|
||||
Documentation/git-push.txt: minor: compress one option
|
||||
contrib/examples/README: give an explanation of the status of these files
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Adeodato Simó (2):
|
||||
builtin-shortlog.c: use string_list_append(), and don't strdup
|
||||
unnecessarily
|
||||
t7501-commit.sh: explicitly check that -F prevents invoking the editor
|
||||
|
||||
Alexander Potashev (1):
|
||||
remove trailing LF in die() messages
|
||||
|
||||
Charles Bailey (4):
|
||||
Fix some tab/space inconsistencies in git-mergetool.sh
|
||||
Add -y/--no-prompt option to mergetool
|
||||
mergetool: Add prompt to continue after failing to merge a file
|
||||
mergetool: Don't keep temporary merge files unless told to
|
||||
|
||||
Christian Couder (1):
|
||||
sha1_file: make "read_object" static
|
||||
|
||||
Clemens Buchacher (3):
|
||||
unpack-trees: handle failure in verify_absent
|
||||
unpack-trees: fix path search bug in verify_absent
|
||||
unpack-trees: remove redundant path search in verify_absent
|
||||
|
||||
Eric Wong (1):
|
||||
git-svn: add --authors-file test
|
||||
|
||||
Fabian Emmes (2):
|
||||
cvsserver: add option to configure commit message
|
||||
cvsserver: change generation of CVS author names
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
gitweb: use href() when generating URLs in OPML
|
||||
|
||||
Jakub Narebski (3):
|
||||
gitweb: Move 'lineno' id from link to row element in git_blame
|
||||
gitweb: A bit of code cleanup in git_blame()
|
||||
gitweb: cache $parent_commit info in git_blame()
|
||||
|
||||
Jeff King (1):
|
||||
Makefile: clean up TEST_PROGRAMS definition
|
||||
|
||||
Johannes Schindelin (5):
|
||||
git wrapper: Make while loop more reader-friendly
|
||||
bisect view: call gitk if Cygwin's SESSIONNAME variable is set
|
||||
bundle: allow rev-list options to exclude annotated tags
|
||||
git add: do not add files from a submodule
|
||||
show <tag>: reuse pp_user_info() instead of duplicating code
|
||||
|
||||
Jon Loeliger (1):
|
||||
Fix Documentation typos surrounding the word 'handful'.
|
||||
|
||||
Junio C Hamano (2):
|
||||
ls-tree: add --full-tree option
|
||||
Update 1.6.2 draft release notes
|
||||
|
||||
Kjetil Barvik (1):
|
||||
Cleanup of unused symcache variable inside diff-lib.c
|
||||
|
||||
Lee Marlow (2):
|
||||
bash completion: Add '--intent-to-add' long option for 'git add'
|
||||
bash completion: Use 'git add' completions for 'git stage'
|
||||
|
||||
Marcel M. Cary (1):
|
||||
git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
|
||||
|
||||
Markus Heidelberg (3):
|
||||
git-cherry: make <upstream> parameter optional
|
||||
Documentation: clarify which parameters are optional to git-cherry
|
||||
contrib/vim: change URL to point to the latest syntax files
|
||||
|
||||
Matt Kraai (1):
|
||||
gitweb: unify boolean feature subroutines
|
||||
|
||||
Miklos Vajna (1):
|
||||
Add support for a pdf version of the user manual
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
Document git-ls-tree --full-tree
|
||||
|
||||
Nguyễn Thái Ngọc Duy (2):
|
||||
grep: support --no-ext-grep to test builtin grep
|
||||
grep: grep cache entries if they are "assume unchanged"
|
||||
|
||||
Nicolas Pitre (1):
|
||||
objects to be pruned immediately don't have to be loosened
|
||||
|
||||
Paul Jarc (1):
|
||||
configure clobbers LDFLAGS
|
||||
|
||||
Philippe Bruhat (1):
|
||||
Git.pm: correctly handle directory name that evaluates to "false"
|
||||
|
||||
Pierre Habouzit (1):
|
||||
filter-branch: add git_commit_non_empty_tree and --prune-empty.
|
||||
|
||||
René Scharfe (2):
|
||||
diff: add option to show context between close hunks
|
||||
strbuf: instate cleanup rule in case of non-memory errors
|
||||
|
||||
SZEDER Gábor (1):
|
||||
bash: add '--merge' to 'git reset'
|
||||
|
||||
William Pursell (2):
|
||||
Add subroutine to display one-line summary of hunks
|
||||
Add 'g' command to go to a hunk
|
||||
|
||||
@@ -1,132 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jan 2009, #02; Mon, 19)
|
||||
X-maint-at: 9d3043cf333ee500e476a558acb234b42e43cc62
|
||||
X-master-at: 28da86a58d7861626eb9d33a1bcfa3e1e79a4d13
|
||||
X-maint-was: 4f8b8992ef0c009822cdca18d32ddf3a124ee284
|
||||
X-master-was: 3cf3b838c7b379824c68ee87799aaaa9028b36cd
|
||||
|
||||
What's in git.git (Jan 2009, #02; Mon, 19)
|
||||
|
||||
maint 9d3043c (Update draft release notes for 1.6.1.1)
|
||||
master 28da86a (difftool: put the cursor on the editable file for Vim)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Tonight's pushout has some git-svn updates included, in addition to a
|
||||
handful of new features.
|
||||
|
||||
Perhaps 1.6.1.1 mid next week.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Christian Couder (1):
|
||||
builtin-fsck: fix off by one head count
|
||||
|
||||
Johannes Schindelin (3):
|
||||
http-push: fix off-by-path_len
|
||||
http-push: when making directories, have a trailing slash in the path
|
||||
name
|
||||
t5540: clarify that http-push does not handle packed-refs on the remote
|
||||
|
||||
Junio C Hamano (2):
|
||||
Update draft release notes to 1.6.1.1
|
||||
Update draft release notes for 1.6.1.1
|
||||
|
||||
Markus Heidelberg (1):
|
||||
Documentation: let asciidoc align related options
|
||||
|
||||
Michael J Gruber (2):
|
||||
add test cases for "git mv -k"
|
||||
fix handling of multiple untracked files for git mv -k
|
||||
|
||||
Miklos Vajna (1):
|
||||
Make t3411 executable
|
||||
|
||||
Stephan Beyer (5):
|
||||
t3501: check that commits are actually done
|
||||
t3404: Add test case for aborted --continue after "edit"
|
||||
t3404: Add test case for auto-amending only edited commits after "edit"
|
||||
builtin-commit.c: do not remove COMMIT_EDITMSG
|
||||
githooks.txt: add missing word
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Adeodato Simó (1):
|
||||
git.c: make autocorrected aliases work
|
||||
|
||||
Alexander Potashev (2):
|
||||
add is_dot_or_dotdot inline function
|
||||
Allow cloning to an existing empty directory
|
||||
|
||||
Brandon Casey (1):
|
||||
t7700: demonstrate misbehavior of 'repack -a' when local packs exist
|
||||
|
||||
David Aguilar (3):
|
||||
contrib: add 'git difftool' for launching common merge tools
|
||||
difftool: fix documentation problems
|
||||
difftool: put the cursor on the editable file for Vim
|
||||
|
||||
David M. Syzdek (1):
|
||||
autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
Eric Wong (4):
|
||||
git-svn: handle empty files marked as symlinks in SVN
|
||||
git-svn: better attempt to handle broken symlink updates
|
||||
git-svn: fix SVN 1.1.x compatibility
|
||||
git-svn: avoid importing nested git repos
|
||||
|
||||
Giuseppe Bilotta (6):
|
||||
gitweb: add patch view
|
||||
gitweb: change call pattern for git_commitdiff
|
||||
gitweb: add patches view
|
||||
gitweb: link to patch(es) view in commit(diff) and (short)log view
|
||||
gitweb: don't use pathinfo for global actions
|
||||
gitweb: suggest name for OPML view
|
||||
|
||||
Junio C Hamano (2):
|
||||
Resurrect "git apply --flags -" to read from the standard input
|
||||
format-patch: show patch text for the root commit
|
||||
|
||||
Keith Cascio (1):
|
||||
test more combinations of ignore-whitespace options to diff
|
||||
|
||||
Marcel Koeppen (1):
|
||||
git-svn: Show UUID in svn info for added directories with svn 1.5.5
|
||||
|
||||
Markus Heidelberg (4):
|
||||
git-commit: color status output when color.ui is set
|
||||
git-status -v: color diff output when color.ui is set
|
||||
Documentation: let asciidoc align related options
|
||||
mergetool: put the cursor on the editable file for Vim
|
||||
|
||||
Miklos Vajna (1):
|
||||
parse-opt: migrate builtin-apply.
|
||||
|
||||
Pete Harlan (1):
|
||||
git-svn: Add --localtime option to "fetch"
|
||||
|
||||
René Scharfe (3):
|
||||
shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
|
||||
grep -w: forward to next possible position after rejected match
|
||||
grep: don't call regexec() for fixed strings
|
||||
|
||||
SZEDER Gábor (3):
|
||||
bash: remove unnecessary checks for long options with argument
|
||||
bash: add missing format-patch command line options
|
||||
bash: refactor 'git log --pretty=<format>' options
|
||||
|
||||
Ted Pavlic (3):
|
||||
bash-completion: Support running when set -u is enabled
|
||||
bash-completion: Try bash completions before simple filetype
|
||||
bash-completion: Add comments to remind about required arguments
|
||||
|
||||
Thomas Rast (7):
|
||||
rebase -i: execute hook only after argument checking
|
||||
diff: accept -- when using --no-index
|
||||
diff --no-index: test for pager after option parsing
|
||||
diff --no-index -q: fix endless loop
|
||||
rebase: learn to rebase root commit
|
||||
rebase -i: learn to rebase root commit
|
||||
rebase: update documentation for --root
|
||||
|
||||
@@ -1,133 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jan 2009, #03; Sat, 24)
|
||||
X-maint-at: 692be9f365be09160f8baa1d6d521d0f65ec4cf9
|
||||
X-master-at: 5dc1308562ab5991ecada68b06707709bea408c9
|
||||
X-maint-was: 9d3043cf333ee500e476a558acb234b42e43cc62
|
||||
X-master-was: 28da86a58d7861626eb9d33a1bcfa3e1e79a4d13
|
||||
|
||||
What's in git.git (Jan 2009, #03; Sat, 24)
|
||||
|
||||
maint 692be9f (Merge branch 'cb/maint-unpack-trees-absense' into maint)
|
||||
master 5dc1308 (Merge branch 'js/patience-diff')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Anders Melchiorsen (4):
|
||||
Documentation: git push repository can also be a remote
|
||||
Documentation: remove a redundant elaboration
|
||||
Documentation: mention branches rather than heads
|
||||
Documentation: avoid using undefined parameters
|
||||
|
||||
Boyd Stephen Smith Jr (1):
|
||||
Fix Documentation for git-describe
|
||||
|
||||
Clemens Buchacher (3):
|
||||
unpack-trees: handle failure in verify_absent
|
||||
unpack-trees: fix path search bug in verify_absent
|
||||
unpack-trees: remove redundant path search in verify_absent
|
||||
|
||||
Johannes Schindelin (3):
|
||||
bisect view: call gitk if Cygwin's SESSIONNAME variable is set
|
||||
git add: do not add files from a submodule
|
||||
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
|
||||
|
||||
Junio C Hamano (1):
|
||||
format-patch: show patch text for the root commit
|
||||
|
||||
Lars Noschinski (1):
|
||||
shell: Document that 'cvs server' is a valid command
|
||||
|
||||
Paul Jarc (1):
|
||||
configure clobbers LDFLAGS
|
||||
|
||||
Philippe Bruhat (1):
|
||||
Git.pm: correctly handle directory name that evaluates to "false"
|
||||
|
||||
René Scharfe (1):
|
||||
shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
|
||||
|
||||
Thomas Rast (3):
|
||||
diff: accept -- when using --no-index
|
||||
diff --no-index: test for pager after option parsing
|
||||
diff --no-index -q: fix endless loop
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Arjen Laarhoven (1):
|
||||
t/t4202-log.sh: Add testcases
|
||||
|
||||
Björn Steinbrink (1):
|
||||
Rename detection: Avoid repeated filespec population
|
||||
|
||||
Brandon Casey (1):
|
||||
Makefile: use shell for-loop rather than Make's foreach loop during
|
||||
install
|
||||
|
||||
Jeff King (2):
|
||||
color: make it easier for non-config to parse color specs
|
||||
expand --pretty=format color options
|
||||
|
||||
Johannes Schindelin (3):
|
||||
Implement the patience diff algorithm
|
||||
Introduce the diff option '--patience'
|
||||
bash completions: Add the --patience option
|
||||
|
||||
Jonas Flodén (1):
|
||||
git-am: Make it easier to see which patch failed
|
||||
|
||||
Junio C Hamano (4):
|
||||
git-am: add --directory=<dir> option
|
||||
Teach format-patch to handle output directory relative to cwd
|
||||
git-am: fix shell quoting
|
||||
git-am: re-fix the diag message printing
|
||||
|
||||
Keith Cascio (2):
|
||||
test more combinations of ignore-whitespace options to diff
|
||||
Fix combined use of whitespace ignore options to diff
|
||||
|
||||
Linus Torvalds (1):
|
||||
Wrap inflate and other zlib routines for better error reporting
|
||||
|
||||
Markus Heidelberg (4):
|
||||
contrib/difftool: change trap condition from SIGINT to INT
|
||||
contrib/difftool: remove distracting 'echo' in the SIGINT handler
|
||||
use uppercase POSIX compliant signals for the 'trap' command
|
||||
bash completion: add 'rename' subcommand to git-remote
|
||||
|
||||
Ralf Wildenhues (1):
|
||||
Fix naming scheme for configure cache variables.
|
||||
|
||||
Ray Chuan (1):
|
||||
http-push: refactor lock-related headers creation for curl requests
|
||||
|
||||
René Scharfe (5):
|
||||
Add ctype test
|
||||
Reformat ctype.c
|
||||
Change NUL char handling of isspecial()
|
||||
Add is_regex_special()
|
||||
Optimize color_parse_mem
|
||||
|
||||
SZEDER Gábor (1):
|
||||
Fix gitdir detection when in subdir of gitdir
|
||||
|
||||
Santi Béjar (2):
|
||||
commit: more compact summary and without extra quotes
|
||||
tutorial-2: Update with the new "git commit" ouput
|
||||
|
||||
Stephan Beyer (5):
|
||||
checkout: don't crash on file checkout before running post-checkout hook
|
||||
Move run_hook() from builtin-commit.c into run-command.c (libgit)
|
||||
api-run-command.txt: talk about run_hook()
|
||||
run_hook(): check the executability of the hook before filling argv
|
||||
run_hook(): allow more than 9 hook arguments
|
||||
|
||||
Thomas Rast (2):
|
||||
bash completion: move pickaxe options to log
|
||||
bash completion: refactor diff options
|
||||
|
||||
martin f. krafft (1):
|
||||
git-am: implement --reject option passed to git-apply
|
||||
|
||||
@@ -1,125 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jan 2009, #04; Wed, 28)
|
||||
X-maint-at: 02322e1619dc537dc48650761f6c9bae883612a7
|
||||
X-master-at: 8712b3cdb0495f5a56b91cd67e2697412447a886
|
||||
X-maint-was: 692be9f365be09160f8baa1d6d521d0f65ec4cf9
|
||||
X-master-was: 5dc1308562ab5991ecada68b06707709bea408c9
|
||||
|
||||
What's in git.git (Jan 2009, #04; Wed, 28)
|
||||
|
||||
maint 02322e1 (send-pack: do not send unknown object name from ".have" to pack-objects)
|
||||
master 8712b3c (Merge branch 'tr/previous-branch')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Folks at Github found that v1.6.1 clients barf when pushing over git
|
||||
protocol to v1.6.1 server if (1) the repository pushed into borrows
|
||||
objects from another repository, and (2) the repository that lends the
|
||||
objects has updates the pusher does not have. The 'maint' branch has a
|
||||
fix for it which 1.6.1.2 will contain when it comes out.
|
||||
|
||||
The master has accumulated enough new features; we should start the -rc
|
||||
freeze soon (with the topics we have in 'next' as of today).
|
||||
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Johannes Schindelin (2):
|
||||
get_sha1_basic(): fix invalid memory access, found by valgrind
|
||||
test-path-utils: Fix off by one, found by valgrind
|
||||
|
||||
Junio C Hamano (2):
|
||||
GIT 1.6.1.1
|
||||
send-pack: do not send unknown object name from ".have" to pack-objects
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Benjamin Kramer (1):
|
||||
Ignore test-ctype
|
||||
|
||||
Boyd Stephen Smith Jr (2):
|
||||
color-words: Support diff.wordregex config option
|
||||
Change the spelling of "wordregex".
|
||||
|
||||
Clemens Buchacher (2):
|
||||
clean up pathspec matching
|
||||
remove pathspec_match, use match_pathspec instead
|
||||
|
||||
Eric Wong (1):
|
||||
git-svn: fix memory leak when checking for empty symlinks
|
||||
|
||||
Giuseppe Bilotta (6):
|
||||
gitweb: channel image in rss feed
|
||||
gitweb: feed generator metadata
|
||||
gitweb: rss feed managingEditor
|
||||
gitweb: rss channel date
|
||||
gitweb: last-modified time should be commiter, not author
|
||||
gitweb: check if-modified-since for feeds
|
||||
|
||||
Jay Soffian (1):
|
||||
git-am: minor cleanups
|
||||
|
||||
Johannes Schindelin (7):
|
||||
Add color_fwrite_lines(), a function coloring each line individually
|
||||
color-words: refactor word splitting and use ALLOC_GROW()
|
||||
color-words: change algorithm to allow for 0-character word boundaries
|
||||
color-words: take an optional regular expression describing words
|
||||
revision walker: include a detached HEAD in --all
|
||||
Fix parsing of @{-1}@{1}
|
||||
rebase -i --root: fix check for number of arguments
|
||||
|
||||
Johannes Sixt (1):
|
||||
Windows: Fix intermittent failures of t7701
|
||||
|
||||
Junio C Hamano (10):
|
||||
checkout: implement "@{-N}" shortcut name for N-th last branch
|
||||
bundle: allow the same ref to be given more than once
|
||||
interpret_nth_last_branch(): avoid traversing the reflog twice
|
||||
Fix reflog parsing for a malformed branch switching entry
|
||||
interpret_nth_last_branch(): plug small memleak
|
||||
Introduce for_each_recent_reflog_ent().
|
||||
Simplify parsing branch switching events in reflog
|
||||
http-push.c: style fixes
|
||||
rebase -i: correctly remember --root flag across --continue
|
||||
tests: Avoid single-shot environment export for shell function invocation
|
||||
|
||||
Kjetil Barvik (5):
|
||||
lstat_cache(): more cache effective symlink/directory detection
|
||||
lstat_cache(): introduce has_symlink_or_noent_leading_path() function
|
||||
lstat_cache(): introduce has_dirs_only_path() function
|
||||
lstat_cache(): introduce invalidate_lstat_cache() function
|
||||
lstat_cache(): introduce clear_lstat_cache() function
|
||||
|
||||
Miklos Vajna (1):
|
||||
gittutorial: remove misleading note
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
Mention "local convention" rule in the CodingGuidelines
|
||||
|
||||
Serge van den Boom (1):
|
||||
Makefile: Make 'configure --with-expat=path' actually work
|
||||
|
||||
Sverre Rabbelier (1):
|
||||
Allow cloning an empty repository
|
||||
|
||||
Ted Pavlic (1):
|
||||
make: Remove -pthread on Darwin (it is included by cstdlib).
|
||||
|
||||
Teemu Likonen (1):
|
||||
diff-options.txt: Fix asciidoc markup issue
|
||||
|
||||
Thomas Rast (7):
|
||||
color-words: enable REG_NEWLINE to help user
|
||||
color-words: expand docs with precise semantics
|
||||
color-words: make regex configurable via attributes
|
||||
sha1_name: tweak @{-N} lookup
|
||||
sha1_name: support @{-N} syntax in get_sha1()
|
||||
checkout: implement "-" abbreviation, add docs and tests
|
||||
t1505: remove debugging cruft
|
||||
|
||||
Vitaly \"_Vi\" Shukela (3):
|
||||
git-svn: add --ignore-paths option for fetching
|
||||
git-svn: documented --ignore-paths
|
||||
git-svn: Add test for --ignore-paths parameter
|
||||
|
||||
@@ -1,146 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Feb 2009, #01; Sun, 01)
|
||||
X-maint-at: 6ac92294b30d7c8619cf15b531448f011dbdcdcc
|
||||
X-master-at: 2ea3c17189bf9ca459879129ca190792b5451f05
|
||||
X-maint-was: 02322e1619dc537dc48650761f6c9bae883612a7
|
||||
X-master-was: 8712b3cdb0495f5a56b91cd67e2697412447a886
|
||||
|
||||
What's in git.git (Feb 2009, #01; Sun, 01)
|
||||
|
||||
maint 6ac9229 (Merge branch 'maint-1.6.0' into maint)
|
||||
master 2ea3c17 (t3412: use log|name-rev instead of log --graph)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
There are yet more fixes that have been cooking in next and then master
|
||||
that have been merged to 'maint' in preparation for the next 1.6.1.X
|
||||
maintenance release.
|
||||
|
||||
On the 'master' front, I think we are ready to plan for 1.6.2 release.
|
||||
Tonight's "What's cooking" should be a pretty good guide for estimating
|
||||
what will be in -rc0, in addition to what we already have in 'master'.
|
||||
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Björn Steinbrink (1):
|
||||
Rename detection: Avoid repeated filespec population
|
||||
|
||||
Jeff King (1):
|
||||
avoid 31-bit truncation in write_loose_object
|
||||
|
||||
Junio C Hamano (3):
|
||||
ls-tree: add --full-tree option
|
||||
Teach format-patch to handle output directory relative to cwd
|
||||
GIT 1.6.1.2
|
||||
|
||||
Marcel M. Cary (1):
|
||||
git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
|
||||
|
||||
Markus Heidelberg (2):
|
||||
git-commit: color status output when color.ui is set
|
||||
git-status -v: color diff output when color.ui is set
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
Document git-ls-tree --full-tree
|
||||
|
||||
Nguyễn Thái Ngọc Duy (2):
|
||||
grep: support --no-ext-grep to test builtin grep
|
||||
grep: grep cache entries if they are "assume unchanged"
|
||||
|
||||
Nicolas Pitre (1):
|
||||
objects to be pruned immediately don't have to be loosened
|
||||
|
||||
René Scharfe (1):
|
||||
merge: fix out-of-bounds memory access
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Anders Melchiorsen (2):
|
||||
Documentation: more git push examples
|
||||
Documentation: rework src/dst description in git push
|
||||
|
||||
David Aguilar (1):
|
||||
contrib/difftool: Don't repeat merge tool candidates
|
||||
|
||||
Giuseppe Bilotta (3):
|
||||
gitweb: make static files accessible with PATH_INFO
|
||||
gitweb: webserver config for PATH_INFO
|
||||
gitweb: align comments to code
|
||||
|
||||
Jake Goulding (3):
|
||||
Make opt_parse_with_commit() non-static
|
||||
Make has_commit() non-static
|
||||
git-tag: Add --contains option
|
||||
|
||||
Jakub Narebski (1):
|
||||
gitweb: Update README that gitweb works better with PATH_INFO
|
||||
|
||||
Jeff King (5):
|
||||
diff: refactor tempfile cleanup handling
|
||||
chain kill signals for cleanup functions
|
||||
refactor signal handling for cleanup functions
|
||||
pager: do wait_for_pager on signal death
|
||||
t0005: use SIGTERM for sigchain test
|
||||
|
||||
Johannes Gilger (1):
|
||||
mergetool: Don't repeat merge tool candidates
|
||||
|
||||
Johannes Schindelin (8):
|
||||
Fix submodule squashing into unrelated commit
|
||||
t3404 & t3411: undo copy&paste
|
||||
lib-rebase.sh: Document what set_fake_editor() does
|
||||
test-lib.sh: introduce test_commit() and test_merge() helpers
|
||||
Simplify t3410
|
||||
Simplify t3411
|
||||
Simplify t3412
|
||||
Fix 'git diff --no-index' with a non-existing symlink target
|
||||
|
||||
Johannes Sixt (1):
|
||||
Windows: Fix signal numbers
|
||||
|
||||
Junio C Hamano (6):
|
||||
Documentation: simplify refspec format description
|
||||
diff.c: output correct index lines for a split diff
|
||||
revision traversal: allow UNINTERESTING objects to be missing
|
||||
rebase -i squashes submodule changes into unrelated commit
|
||||
builtin-apply.c: do not set bogus mode in check_preimage() for deleted
|
||||
path
|
||||
Update draft release notes to 1.6.2
|
||||
|
||||
Kirill Smelkov (5):
|
||||
mailinfo: correctly handle multiline 'Subject:' header
|
||||
mailinfo: 'From:' header should be unfold as well
|
||||
mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U
|
||||
Thor)'
|
||||
mailinfo: tests for RFC2047 examples
|
||||
mailinfo: cleanup extra spaces for complex 'From:'
|
||||
|
||||
Markus Heidelberg (1):
|
||||
contrib/difftool: add support for Kompare
|
||||
|
||||
Michele Ballabio (1):
|
||||
git-shortlog.txt: fix example about .mailmap
|
||||
|
||||
Stefan Karpinski (2):
|
||||
git-cvsserver: handle CVS 'noop' command.
|
||||
git-cvsserver: run post-update hook *after* update.
|
||||
|
||||
Steffen Prohaska (6):
|
||||
Move computation of absolute paths from Makefile to runtime (in
|
||||
preparation for RUNTIME_PREFIX)
|
||||
git_extract_argv0_path(): Move check for valid argv0 from caller to
|
||||
callee
|
||||
Add calls to git_extract_argv0_path() in programs that call git_config_*
|
||||
Modify setup_path() to only add git_exec_path() to PATH
|
||||
Compute prefix at runtime if RUNTIME_PREFIX is set
|
||||
Windows: Revert to default paths and convert them by RUNTIME_PREFIX
|
||||
|
||||
Steve Haslam (1):
|
||||
Refactor git_set_argv0_path() to git_extract_argv0_path()
|
||||
|
||||
Thomas Rast (2):
|
||||
t3412: clean up GIT_EDITOR usage
|
||||
t3412: use log|name-rev instead of log --graph
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Feb 2009, #02; Wed, 11)
|
||||
X-maint-at: e5887c1bda12b31ea7af0ce798bfdee308e1b176
|
||||
X-master-at: 30aa4fb15fa408596dea59cdc9f00c94eeaa69f1
|
||||
X-maint-was: b59122f86f23007fce374f92de7f6e0a73793026
|
||||
X-master-was: 621f1b4bcf40f1469fc59202248df35619e33c82
|
||||
|
||||
What's in git.git (Feb 2009, #02; Wed, 11)
|
||||
|
||||
maint e5887c1 (Prepare for 1.6.1.4.)
|
||||
master 30aa4fb (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
There are handful of fixes for 1.6.1.4 on maint that are also in master.
|
||||
|
||||
The 'notes' topic has been kicked out of master for now.
|
||||
|
||||
I think 'master' is ready to be tagged as v1.6.2-rc1, but I'll be giving a
|
||||
few days for people to try out the current 'master' before doing so. I've
|
||||
merged git-svn updates, but haven't pulled either git-gui or gitk updates
|
||||
yet, which need to happen before -rc1.
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Christian Couder (1):
|
||||
rev-list: fix showing distance when using --bisect-all
|
||||
|
||||
Elijah Newren (1):
|
||||
fast-export: ensure we traverse commits in topological order
|
||||
|
||||
Junio C Hamano (3):
|
||||
revision traversal and pack: notice and die on missing commit
|
||||
Make repack less likely to corrupt repository
|
||||
Prepare for 1.6.1.4.
|
||||
|
||||
Matt McCutchen (1):
|
||||
gitweb: add $prevent_xss option to prevent XSS by repository content
|
||||
|
||||
Shawn O. Pearce (2):
|
||||
Clear the delta base cache during fast-import checkpoint
|
||||
Clear the delta base cache if a pack is rebuilt
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alexandre Julliard (1):
|
||||
Describe notable git.el changes in the release notes
|
||||
|
||||
Anton Gyllenberg (1):
|
||||
test case for regression caused by git-svn empty symlink fix
|
||||
|
||||
Deskin Miller (1):
|
||||
git-svn: Print revision while searching for earliest use of path
|
||||
|
||||
Eric Kidd (1):
|
||||
filter-branch: Add more error-handling
|
||||
|
||||
Eric Wong (2):
|
||||
git-svn: allow disabling expensive broken symlink checks
|
||||
git-svn: fix broken symlink workaround when switching branches
|
||||
|
||||
Johannes Schindelin (3):
|
||||
Let ls-files strip trailing slashes in submodules' paths
|
||||
submodule: warn about non-submodules
|
||||
Add two extra tests for git rebase
|
||||
|
||||
Johannes Sixt (4):
|
||||
Make test-path-utils more robust against incorrect use
|
||||
Move sanitary_path_copy() to path.c and rename it to
|
||||
normalize_path_copy()
|
||||
Test and fix normalize_path_copy()
|
||||
Remove unused normalize_absolute_path()
|
||||
|
||||
Junio C Hamano (8):
|
||||
Revert "Merge branch 'js/notes'"
|
||||
Modernize t5400 test script
|
||||
remote prune: warn dangling symrefs
|
||||
Warn use of "origin" when remotes/origin/HEAD is dangling
|
||||
Drop double-semicolon in C
|
||||
receive-pack: receive.denyDeleteCurrent
|
||||
builtin-receive-pack.c: do not initialize statics to 0
|
||||
Squelch overzealous "ignoring dangling symref" in an empty repository
|
||||
|
||||
Lars Hjemli (1):
|
||||
tree.c: allow read_tree_recursive() to traverse gitlink entries
|
||||
|
||||
Michael J Gruber (1):
|
||||
Fix the installation path for html documentation
|
||||
|
||||
Pat Notz (1):
|
||||
Fix contrib/hooks/post-receive-email for new duplicate branch
|
||||
|
||||
René Scharfe (1):
|
||||
Fix GIT_CEILING_DIRECTORIES on Windows
|
||||
|
||||
Sam Vilain (1):
|
||||
git-svn: abstract out a block into new method other_gs()
|
||||
|
||||
Santi Béjar (1):
|
||||
doc/bundle: Use the more conventional suffix '.bundle'
|
||||
|
||||
Sitaram Chamarty (1):
|
||||
Documentation: clarify commits affected by gitk --merge
|
||||
|
||||
Stephan Beyer (3):
|
||||
add -p: get rid of Git.pm warnings about unitialized values
|
||||
Makefile: resort filenames alphabetically
|
||||
Generalize and libify index_is_dirty() to index_differs_from(...)
|
||||
|
||||
Ted Pavlic (2):
|
||||
completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable
|
||||
errors.
|
||||
completion: Get rid of tabbed indentation in comments. Replace with
|
||||
spaces.
|
||||
|
||||
Todd Zullinger (1):
|
||||
git-web--browse: Fix check for /bin/start
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Feb 2009, #03; Sun, 15)
|
||||
X-maint-at: e5887c1bda12b31ea7af0ce798bfdee308e1b176
|
||||
X-master-at: 075394e26cd7fb38e08d5f637a5fc825ab0b3fb3
|
||||
X-maint-was: e5887c1bda12b31ea7af0ce798bfdee308e1b176
|
||||
X-master-was: 30aa4fb15fa408596dea59cdc9f00c94eeaa69f1
|
||||
|
||||
What's in git.git (Feb 2009, #03; Sun, 15)
|
||||
|
||||
maint e5887c1 (Prepare for 1.6.1.4.)
|
||||
master 075394e (RelNotes Update)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
This is hopefully the last announcement before 1.6.2-rc1 is tagged.
|
||||
Nothing unexpectedly complex nor controversial, just bunch of follow-up
|
||||
fixes to what have already been scheduled for the upcoming release.
|
||||
|
||||
I am going to bed now; it is way past my bedtime.
|
||||
|
||||
* The 'master' branch has these since the last announcement.
|
||||
|
||||
Fabian Franz (1):
|
||||
submodule: add --no-fetch parameter to update command
|
||||
|
||||
Jacob Helwig (1):
|
||||
Add 'rm -f' equivalent to 'git rm' example of filter-branch
|
||||
--index-filter
|
||||
|
||||
Jakub Narebski (1):
|
||||
gitweb: Better regexp for SHA-1 committag match
|
||||
|
||||
Jeff King (1):
|
||||
symbolic-ref: allow refs/<whatever> in HEAD
|
||||
|
||||
Jeremy White (1):
|
||||
Update documentation to add further information about using Thunderbird
|
||||
with git-imap-send.
|
||||
|
||||
Johannes Schindelin (1):
|
||||
gc: make --prune useful again by accepting an optional parameter
|
||||
|
||||
Junio C Hamano (5):
|
||||
Revert "validate_headref: tighten ref-matching to just branches"
|
||||
Install the default "master" branch configuration after cloning a void
|
||||
Teach the "@{-1} syntax to "git branch"
|
||||
Teach @{-1} to git merge
|
||||
RelNotes Update
|
||||
|
||||
Keith Cascio (1):
|
||||
Remove redundant bit clears from diff_setup()
|
||||
|
||||
Marcel M. Cary (1):
|
||||
git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
|
||||
|
||||
Marius Storm-Olsen (5):
|
||||
Add mailmap.file as configurational option for mailmap location
|
||||
Add find_insert_index, insert_at_index and clear_func functions to
|
||||
string_list
|
||||
Add map_user() and clear_mailmap() to mailmap
|
||||
Change current mailmap usage to do matching on both name and email of
|
||||
author/committer.
|
||||
Move mailmap documentation into separate file
|
||||
|
||||
Mark Burton (1):
|
||||
git-rebase.txt: --interactive does not work with --whitespace
|
||||
|
||||
Matt Kraai (1):
|
||||
bash-completion: Complete the values of color.interactive, color.ui,
|
||||
color.pager
|
||||
|
||||
Nazri Ramliy (1):
|
||||
Bugfix: GIT_EXTERNAL_DIFF with more than one changed files
|
||||
|
||||
SZEDER Gábor (3):
|
||||
Move 'rev-parse --git-dir' test to t1500
|
||||
t1500: more 'git rev-parse --git-dir' tests
|
||||
bash: fix misspelled 'git svn' option
|
||||
|
||||
Tay Ray Chuan (1):
|
||||
use a hash of the lock token as the suffix for PUT/MOVE
|
||||
|
||||
Thomas Rast (2):
|
||||
log: do not print ellipses with --abbrev-commit
|
||||
Documentation: pruning recipe for destructive filter-branch
|
||||
|
||||
@@ -1,152 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Mar 2009, #01; Tue, 03)
|
||||
X-maint-at: dcc901bc2926f92558a854430570123b4152451d
|
||||
X-master-at: 1d035f85649cbb0a4fcc3e341f7e854acf9cf3c1
|
||||
X-maint-was: e5887c1bda12b31ea7af0ce798bfdee308e1b176
|
||||
X-master-was: 075394e26cd7fb38e08d5f637a5fc825ab0b3fb3
|
||||
|
||||
What's in git.git (Mar 2009, #01; Tue, 03)
|
||||
|
||||
maint dcc901b (Documentation: minor grammatical fixes.)
|
||||
master 1d035f8 (Documentation: minor grammatical fixes.)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Hopefully the last "What's in" before 1.6.2 final. Small fixes here and
|
||||
there and nothing earth shattering.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Danijel Tasov (1):
|
||||
added missing backtick in git-apply.txt
|
||||
|
||||
David J. Mellor (1):
|
||||
Documentation: minor grammatical fixes.
|
||||
|
||||
Gerrit Pape (1):
|
||||
Documentation/git-push: --all, --mirror, --tags can not be combined
|
||||
|
||||
Junio C Hamano (1):
|
||||
tests: fix "export var=val"
|
||||
|
||||
Matthieu Moy (2):
|
||||
Document git blame --reverse.
|
||||
More friendly message when locking the index fails.
|
||||
|
||||
Michael Spang (1):
|
||||
Skip timestamp differences for diff --no-index
|
||||
|
||||
Todd Zullinger (1):
|
||||
Documentation: Note file formats send-email accepts
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Abhijit Menon-Sen (1):
|
||||
Convert git-* invocations to "git *" in the svnimport example.
|
||||
|
||||
Alexandre Julliard (3):
|
||||
git.el: Make sure that file lists are sorted as they are created.
|
||||
git.el: Improve the confirmation message on remove and revert.
|
||||
Add a README in the contrib/emacs directory.
|
||||
|
||||
Allan Caffee (1):
|
||||
trace: Fixed a minor typo in an error message.
|
||||
|
||||
Ben Walton (2):
|
||||
git-svn fix to avoid using strftime %z
|
||||
git-svn - return original format_svn_date semantics
|
||||
|
||||
Brian Gernhardt (1):
|
||||
git-svn: Create leading directories in create-ignore
|
||||
|
||||
Christian Couder (3):
|
||||
README: fix path to "gitcvs-migration.txt" and be more consistent
|
||||
bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
|
||||
bisect: fix another instance of eval'ed string
|
||||
|
||||
David J. Mellor (3):
|
||||
Documentation: minor grammatical fixes.
|
||||
Documentation: minor grammatical fixes.
|
||||
Documentation: minor grammatical fixes.
|
||||
|
||||
Dévai Tamás (1):
|
||||
git-svn: Fix for rewriteRoot URL containing username.
|
||||
|
||||
Eric Wong (2):
|
||||
git-svn: fix delete+add branch tracking with empty files
|
||||
git-svn: disable broken symlink workaround by default
|
||||
|
||||
Felipe Contreras (2):
|
||||
git add: trivial codestyle cleanup
|
||||
sha1_file.c: fix typo
|
||||
|
||||
Gerrit Pape (2):
|
||||
Install builtins with the user and group of the installing personality
|
||||
git-quiltimport: preserve standard input to be able to read user input
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
gitweb: fix wrong base URL when non-root DirectoryIndex
|
||||
|
||||
Jay Soffian (3):
|
||||
disallow providing multiple upstream branches to rebase, pull --rebase
|
||||
Allow HTTP tests to run on Darwin
|
||||
t5540-http-push.sh: avoid non-portable grep -P
|
||||
|
||||
Johannes Schindelin (2):
|
||||
Introduce the function strip_path_suffix()
|
||||
system_path(): simplify using strip_path_suffix(), and add suffix "git"
|
||||
|
||||
Johannes Sixt (2):
|
||||
gitattributes.txt: Path matching rules are explained in gitignore.txt
|
||||
t3400-rebase: Move detached HEAD check earlier
|
||||
|
||||
Junio C Hamano (4):
|
||||
git-svn: fix parsing of timestamp obtained from svn
|
||||
Make sure objects/pack exists before creating a new pack
|
||||
GIT 1.6.2-rc2
|
||||
git-am: make --abort less dangerous
|
||||
|
||||
Lars Noschinski (1):
|
||||
filter-branch -d: Export GIT_DIR earlier
|
||||
|
||||
Linus Torvalds (1):
|
||||
Support 'raw' date format
|
||||
|
||||
Marc Branchaud (1):
|
||||
Docs: Expand explanation of the use of + in git push refspecs.
|
||||
|
||||
Marcel M. Cary (2):
|
||||
gitweb: Fix warnings with override permitted but no repo override
|
||||
gitweb: Hyperlink multiple git hashes on the same commit message line
|
||||
|
||||
Michael J Gruber (2):
|
||||
Fix typo in contrib/examples/git-svnimport.txt
|
||||
git-am: Keep index in case of abort with dirty index
|
||||
|
||||
Mike Ralphson (1):
|
||||
Fix odb_mkstemp() on AIX
|
||||
|
||||
Paul Mackerras (1):
|
||||
gitk: Fix possible infinite loop and display corruption
|
||||
|
||||
Pete Wyckoff (1):
|
||||
git-p4: avoid syncing duplicate changes
|
||||
|
||||
Peter Oberndorfer (1):
|
||||
git-svn: read the dcommit url from the config file on a per remote basis
|
||||
|
||||
René Scharfe (1):
|
||||
builtin-receive-pack.c: fix compiler warnings about format string
|
||||
|
||||
SZEDER Gábor (2):
|
||||
bash: add missing 'git merge' options
|
||||
bash: update 'git svn' options
|
||||
|
||||
Thomas Rast (2):
|
||||
bash completion: refactor common log, shortlog and gitk options
|
||||
bash completion: only show 'log --merge' if merging
|
||||
|
||||
Todd Zullinger (1):
|
||||
git-rebase: Update --whitespace documentation
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Mar 2009, #02; Thu, 05)
|
||||
X-maint-at: bdfd739dac4c109ce360d38d0572d8717a46e795
|
||||
X-master-at: 836769e875ecf47e83137a39de5937652e0e861e
|
||||
X-maint-was: b47530b5f33898b5607603b16c56bd2adcc4ac70
|
||||
X-master-was: b47530b5f33898b5607603b16c56bd2adcc4ac70
|
||||
|
||||
What's in git.git (Mar 2009, #02; Thu, 05)
|
||||
|
||||
maint bdfd739 (Make the 'lock file' exists error more informative)
|
||||
master 836769e (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
The release is out, and immediately after that somebody spots a minor
|
||||
bug.
|
||||
|
||||
If things go as planned, tomorrow we will see a mass graduation to the
|
||||
master branch of topics that have been cooking in next during the pre
|
||||
release freeze period.
|
||||
|
||||
* The 'maint' branch has these fixes since v1.6.2
|
||||
|
||||
John Tapsell (1):
|
||||
Make the 'lock file' exists error more informative
|
||||
|
||||
Junio C Hamano (1):
|
||||
Beginning of 1.6.2 maintenance track
|
||||
|
||||
|
||||
* The 'master' branch has these since v1.6.2 in addition to the above.
|
||||
|
||||
Carlos Manuel Duclos Vergara (1):
|
||||
git-archive: add --output=<file> to send output to a file
|
||||
|
||||
Christian Couder (1):
|
||||
rev-list: estimate number of bisection step left
|
||||
|
||||
Jeff King (1):
|
||||
improve missing repository error message
|
||||
|
||||
John Tapsell (3):
|
||||
Modify description file to say what this file is
|
||||
Google has renamed the imap folder
|
||||
Improve error message for git-filter-branch
|
||||
|
||||
Keith Cascio (2):
|
||||
Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking
|
||||
Fix neglect of diff_setup()/diff_setup_done() symmetry.
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Mar 2009, #03; Fri, 06)
|
||||
X-maint-at: bdfd739dac4c109ce360d38d0572d8717a46e795
|
||||
X-master-at: 8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7
|
||||
X-maint-was: bdfd739dac4c109ce360d38d0572d8717a46e795
|
||||
X-master-was: 836769e875ecf47e83137a39de5937652e0e861e
|
||||
|
||||
What's in git.git (Mar 2009, #03; Fri, 06)
|
||||
|
||||
maint bdfd739 (Make the 'lock file' exists error more informative)
|
||||
master 8cc3fe4 (Merge branch 'en/maint-hash-object')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Quite a many topics that have been scheduled for 'master' for some time
|
||||
have all graduated. With this pace we may be able to have a very short
|
||||
cycle for a change before 1.6.3 final ;-).
|
||||
|
||||
* The 'master' branch has these since the last announcement.
|
||||
|
||||
Arjen Laarhoven (2):
|
||||
Clean up use of ANSI color sequences
|
||||
builtin-branch.c: Rename branch category color names
|
||||
|
||||
Deskin Miller (1):
|
||||
add -i: revisit hunk on editor failure
|
||||
|
||||
Elijah Newren (1):
|
||||
Ensure proper setup of git_dir for git-hash-object
|
||||
|
||||
Felipe Contreras (3):
|
||||
config: Add new option to open an editor.
|
||||
git config: codestyle cleanups
|
||||
Add tests for git log --pretty, --format and --oneline.
|
||||
|
||||
Finn Arne Gangstad (1):
|
||||
Support "\" in non-wildcard exclusion entries
|
||||
|
||||
Jay Soffian (6):
|
||||
builtin-branch: improve output when displaying remote branches
|
||||
send-email: allow send-email to run outside a repo
|
||||
send-email: handle multiple Cc addresses when reading mbox message
|
||||
send-email: --suppress-cc improvements
|
||||
send-email: don't create temporary compose file until it is needed
|
||||
send-email: add --confirm option and configuration setting
|
||||
|
||||
Jeff King (4):
|
||||
valgrind: ignore ldso and more libz errors
|
||||
branch: clean up repeated strlen
|
||||
add basic branch display tests
|
||||
never fallback relative times to absolute
|
||||
|
||||
Jeremy White (2):
|
||||
Enable setting attach as the default in .gitconfig for git-format-patch.
|
||||
imap.preformattedHTML to tell Thunderbird to send non-flowed text
|
||||
|
||||
Johannes Schindelin (11):
|
||||
Add valgrind support in test scripts
|
||||
Valgrind support: check for more than just programming errors
|
||||
test-lib.sh: optionally output to test-results/$TEST.out, too
|
||||
t/Makefile: provide a 'valgrind' target
|
||||
Add a script to coalesce the valgrind outputs
|
||||
Tests: let --valgrind imply --verbose and --tee
|
||||
test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
|
||||
valgrind: do not require valgrind 3.4.0 or newer
|
||||
Avoid segfault with 'git branch' when the HEAD is detached
|
||||
git config: trivial cleanup for editor action
|
||||
MinGW: 64-bit file offsets
|
||||
|
||||
John Tapsell (1):
|
||||
Documentation - More examples for git bisect
|
||||
|
||||
Junio C Hamano (4):
|
||||
git-blame: refactor code to emit "porcelain format" output
|
||||
blame: show "previous" information in --porcelain/--incremental format
|
||||
git-add -i/-p: learn to unwrap C-quoted paths
|
||||
Draft release notes: Carry forward the warning for behaviour changes
|
||||
|
||||
Marius Storm-Olsen (2):
|
||||
Add bare repository indicator for __git_ps1
|
||||
Fixup: Add bare repository indicator for __git_ps1
|
||||
|
||||
Nanako Shiraishi (3):
|
||||
Add --format that is a synonym to --pretty
|
||||
Give short-hands to --pretty=tformat:%formatstring
|
||||
Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
|
||||
|
||||
SZEDER Gábor (1):
|
||||
rerere: remove duplicated functions
|
||||
|
||||
Sverre Rabbelier (1):
|
||||
Teach rebase to rebase even if upstream is up to date
|
||||
|
||||
Ted Pavlic (4):
|
||||
completion: For consistency, change "git rev-parse" to __gitdir calls
|
||||
completion: Use consistent if [...] convention, not "test"
|
||||
completion: Better __git_ps1 support when not in working directory
|
||||
completion: More fixes to prevent unbound variable errors
|
||||
|
||||
Teemu Likonen (1):
|
||||
bash completion: add --format= and --oneline options for "git log"
|
||||
|
||||
@@ -1,150 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Mar 2009, #04; Sat, 14)
|
||||
X-maint-at: a54a216098db10d551d33123f33667ce8a036510
|
||||
X-master-at: bba2a7b22fdde7a214516e93d957a950571a2026
|
||||
X-maint-was: bdfd739dac4c109ce360d38d0572d8717a46e795
|
||||
X-master-was: 8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7
|
||||
|
||||
What's in git.git (Mar 2009, #04; Sat, 14)
|
||||
|
||||
maint a54a216 (Merge branch 'maint-1.6.1' into maint)
|
||||
master bba2a7b (test-lib: write test results to test-results/<basename>-<pid>)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Perhaps I'll cut the first maintenance release since 1.6.2 sometime soon.
|
||||
It turns out that 1.6.2 cycle was quite successful in producing a solid
|
||||
release.
|
||||
|
||||
Quite a many topics have graduated to 'master'. Perhaps we can start the
|
||||
pre-release freeze in two weeks for 1.6.3.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Chris Johnsen (1):
|
||||
builtin-revert.c: release index lock when cherry-picking an empty commit
|
||||
|
||||
Christian Couder (1):
|
||||
Documentation: fix badly indented paragraphs in "--bisect-all"
|
||||
description
|
||||
|
||||
Elijah Newren (1):
|
||||
Ensure proper setup of git_dir for git-hash-object
|
||||
|
||||
Finn Arne Gangstad (1):
|
||||
Support "\" in non-wildcard exclusion entries
|
||||
|
||||
Jay Soffian (4):
|
||||
send-email: allow send-email to run outside a repo
|
||||
send-email: handle multiple Cc addresses when reading mbox message
|
||||
send-email: --suppress-cc improvements
|
||||
send-email: don't create temporary compose file until it is needed
|
||||
|
||||
Jeff King (3):
|
||||
never fallback relative times to absolute
|
||||
t1300: use test_must_fail as appropriate
|
||||
document config --bool-or-int
|
||||
|
||||
Junio C Hamano (2):
|
||||
git-add -i/-p: learn to unwrap C-quoted paths
|
||||
Update draft release notes for 1.6.2.1
|
||||
|
||||
René Scharfe (1):
|
||||
cleanup: add isascii()
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Benjamin Kramer (3):
|
||||
Remove unused function scope local variables
|
||||
Move local variables to narrower scopes
|
||||
Remove unused assignments
|
||||
|
||||
Daniel Barkalow (1):
|
||||
Include log_config module in apache.conf
|
||||
|
||||
David Aguilar (1):
|
||||
contrib/difftool: use a separate config namespace for difftool commands
|
||||
|
||||
Erik Faye-Lund (1):
|
||||
connect.c: remove a few globals by using git_config callback data
|
||||
|
||||
Eugene Letuchy (1):
|
||||
Make git blame's date output format configurable, like git log
|
||||
|
||||
Jay Soffian (3):
|
||||
bash completion: fix completion issues with fetch, pull, and push
|
||||
bash completion: refactor --strategy completion
|
||||
bash completion: teach fetch, pull, and push to complete their options
|
||||
|
||||
Jeff King (1):
|
||||
clone: run post-checkout hook when checking out
|
||||
|
||||
Johannes Schindelin (5):
|
||||
Brown paper bag fix for MinGW 64-bit stat
|
||||
Add an (optional, since expensive) test for >2gb clones
|
||||
MinGW: fix diff --no-index /dev/null ...
|
||||
test: do not LoadModule log_config_module unconditionally
|
||||
test-lib: write test results to test-results/<basename>-<pid>
|
||||
|
||||
Johannes Sixt (1):
|
||||
test-suite: Make test script numbers unique
|
||||
|
||||
Junio C Hamano (8):
|
||||
git-repack: resist stray environment variable
|
||||
has_sha1_pack(): refactor "pretend these packs do not exist" interface
|
||||
has_sha1_kept_pack(): take "struct rev_info"
|
||||
Consolidate ignore_packed logic more
|
||||
Simplify is_kept_pack()
|
||||
is_kept_pack(): final clean-up
|
||||
Update draft release notes to 1.6.3
|
||||
Update release notes to 1.6.3
|
||||
|
||||
Michael J Gruber (3):
|
||||
git submodule: Add test cases for git submodule add
|
||||
git submodule: Fix adding of submodules at paths with ./, .. and //
|
||||
Typo and language fixes for git-checkout.txt
|
||||
|
||||
Michael Lai (1):
|
||||
git-svn: support intermediate paths when matching tags/branches
|
||||
|
||||
Pete Wyckoff (1):
|
||||
git-p4: remove tabs from usermap file
|
||||
|
||||
Ramsay Allan Jones (1):
|
||||
git-instaweb: fix lighttpd configuration on cygwin
|
||||
|
||||
René Scharfe (8):
|
||||
diffcore-pickaxe: use memmem()
|
||||
optimize compat/ memmem()
|
||||
parseopt: add PARSE_OPT_KEEP_UNKNOWN
|
||||
parseopt: add PARSE_OPT_NO_INTERNAL_HELP
|
||||
parseopt: make usage optional
|
||||
archive: use parseopt for local-only options
|
||||
parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP
|
||||
parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used
|
||||
together
|
||||
|
||||
Tay Ray Chuan (1):
|
||||
http.c: use strbuf API in quote_ref_url
|
||||
|
||||
Thomas Rast (13):
|
||||
format-patch: threading test reactivation
|
||||
Support coverage testing with GCC/gcov
|
||||
Test that diff can read from stdin
|
||||
Test diff --dirstat functionality
|
||||
Test log --graph
|
||||
Test fsck a bit harder
|
||||
Test log --decorate
|
||||
Test rev-list --parents/--children
|
||||
Test git-patch-id
|
||||
format-patch: track several references
|
||||
format-patch: thread as reply to cover letter even with in-reply-to
|
||||
format-patch: support deep threading
|
||||
Documentation: filter-branch: show --ignore-unmatch in main index-filter
|
||||
example
|
||||
|
||||
Tor Arne Vestbø (2):
|
||||
git-rebase: Add --stat and --no-stat for producing diffstat on rebase
|
||||
git-pull: Allow --stat and --no-stat to be used with --rebase
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Mar 2009, #05; Tue, 17)
|
||||
X-maint-at: 6f55ee4317681a5639ff364d2f0a352bde064269
|
||||
X-master-at: e986ceb05a118944d2638fba4cd09678c1afa6b3
|
||||
X-maint-was: a54a216098db10d551d33123f33667ce8a036510
|
||||
X-master-was: bba2a7b22fdde7a214516e93d957a950571a2026
|
||||
|
||||
What's in git.git (Mar 2009, #05; Tue, 17)
|
||||
|
||||
maint 6f55ee4 (GIT 1.6.2.1)
|
||||
master e986ceb (Update draft release notes to 1.6.3)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Notable topics graduated are Jay's "git remote" improvements, Kjetil's
|
||||
"git checkout" optimization, and René's "git grep --color".
|
||||
|
||||
Post 1.6.2 cycle seems to be nicely progressing, and with another mass
|
||||
graduation like this hopefully we can go into pre-release freeze for the
|
||||
next release fairly soon.
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to what are already in v1.6.2.1.
|
||||
|
||||
Alex Riesen (1):
|
||||
disable post-checkout test on Cygwin
|
||||
|
||||
Benjamin Kramer (1):
|
||||
Fix various dead stores found by the clang static analyzer
|
||||
|
||||
Brian Gernhardt (2):
|
||||
Create USE_ST_TIMESPEC and turn it on for Darwin
|
||||
Makefile: Set compiler switch for USE_NSEC
|
||||
|
||||
Chris Johnsen (2):
|
||||
git-push.txt: describe how to default to pushing only current branch
|
||||
Documentation: remove extra quoting/emphasis around literal texts
|
||||
|
||||
Daniel Barkalow (1):
|
||||
Give error when no remote is configured
|
||||
|
||||
Emil Sit (1):
|
||||
config.txt: Describe special 'none' handling in core.gitProxy.
|
||||
|
||||
Jay Soffian (18):
|
||||
move duplicated get_local_heads() to remote.c
|
||||
move duplicated ref_newer() to remote.c
|
||||
move locate_head() to remote.c
|
||||
remote: simplify guess_remote_head()
|
||||
remote: make copy_ref() perform a deep copy
|
||||
remote: let guess_remote_head() optionally return all matches
|
||||
remote: make match_refs() copy src ref before assigning to peer_ref
|
||||
remote: make match_refs() not short-circuit
|
||||
string-list: new for_each_string_list() function
|
||||
builtin-remote: refactor duplicated cleanup code
|
||||
builtin-remote: remove unused code in get_ref_states
|
||||
builtin-remote: rename variables and eliminate redundant function call
|
||||
builtin-remote: make get_remote_ref_states() always populate
|
||||
states.tracked
|
||||
builtin-remote: fix two inconsistencies in the output of "show <remote>"
|
||||
builtin-remote: teach show to display remote HEAD
|
||||
builtin-remote: add set-head subcommand
|
||||
builtin-remote: new show output style
|
||||
builtin-remote: new show output style for push refspecs
|
||||
|
||||
Jeff King (5):
|
||||
test scripts: refactor start_httpd helper
|
||||
add basic http clone/fetch tests
|
||||
refactor find_ref_by_name() to accept const list
|
||||
remote: make guess_remote_head() use exact HEAD lookup if it is available
|
||||
ls-files: require worktree when --deleted is given
|
||||
|
||||
Johannes Schindelin (2):
|
||||
rsync transport: allow local paths, and fix tests
|
||||
winansi: support ESC [ K (erase in line)
|
||||
|
||||
Johannes Sixt (1):
|
||||
recv_sideband: Bands #2 and #3 always go to stderr
|
||||
|
||||
Junio C Hamano (6):
|
||||
builtin-remote.c: no "commented out" code, please
|
||||
Not all systems use st_[cm]tim field for ns resolution file timestamp
|
||||
grep: cast printf %.*s "precision" argument explicitly to int
|
||||
read-tree A B C: do not create a bogus index and do not segfault
|
||||
Remove total confusion from git-fetch and git-push
|
||||
Update draft release notes to 1.6.3
|
||||
|
||||
Kjetil Barvik (17):
|
||||
lstat_cache(): small cleanup and optimisation
|
||||
lstat_cache(): generalise longest_match_lstat_cache()
|
||||
lstat_cache(): swap func(length, string) into func(string, length)
|
||||
unlink_entry(): introduce schedule_dir_for_removal()
|
||||
create_directories(): remove some memcpy() and strchr() calls
|
||||
write_entry(): cleanup of some duplicated code
|
||||
write_entry(): use fstat() instead of lstat() when file is open
|
||||
show_patch_diff(): remove a call to fstat()
|
||||
lstat_cache(): print a warning if doing ping-pong between cache types
|
||||
check_updates(): effective removal of cache entries marked CE_REMOVE
|
||||
fix compile error when USE_NSEC is defined
|
||||
make USE_NSEC work as expected
|
||||
verify_uptodate(): add ce_uptodate(ce) test
|
||||
write_index(): update index_state->timestamp after flushing to disk
|
||||
Record ns-timestamps if possible, but do not use it without USE_NSEC
|
||||
checkout bugfix: use stat.mtime instead of stat.ctime in two places
|
||||
Revert "lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types"
|
||||
|
||||
Michael J Gruber (1):
|
||||
git-branch.txt: document -f correctly
|
||||
|
||||
Miklos Vajna (1):
|
||||
Tests: use test_cmp instead of diff where possible
|
||||
|
||||
Nguyễn Thái Ngọc Duy (1):
|
||||
grep: prefer builtin over external one when coloring results
|
||||
|
||||
Petr Kodl (2):
|
||||
MinGW: a helper function that translates Win32 API error codes
|
||||
MinGW: a hardlink implementation
|
||||
|
||||
René Scharfe (6):
|
||||
grep: micro-optimize hit collection for AND nodes
|
||||
grep: remove grep_opt argument from match_expr_eval()
|
||||
grep: add pmatch and eflags arguments to match_one_pattern()
|
||||
grep: color patterns in output
|
||||
grep: add support for coloring with external greps
|
||||
pickaxe: count regex matches only once
|
||||
|
||||
Stephen Boyd (1):
|
||||
git-send-email.txt: describe --compose better
|
||||
|
||||
Thomas Rast (2):
|
||||
send-email: respect in-reply-to regardless of threading
|
||||
send-email: test --no-thread --in-reply-to combination
|
||||
|
||||
@@ -1,381 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Mar 2009, #06; Mon, 30)
|
||||
X-maint-at: 8c7f78823888306c1cceafcf5fd26739eef99ce3
|
||||
X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90
|
||||
X-maint-was: a54a216098db10d551d33123f33667ce8a036510
|
||||
X-master-was: bba2a7b22fdde7a214516e93d957a950571a2026
|
||||
|
||||
What's in git.git (Mar 2009, #06; Mon, 30)
|
||||
|
||||
maint 8c7f788 (Update draft release notes to 1.6.2.2)
|
||||
master 442dd42 (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Many small updates on the 'master' front. I think we can declare feature
|
||||
freeze for 1.6.3 in about a week, tag -rc0, and keep topics that are still
|
||||
in 'pu' cooking for 1.6.4 (there are some good ones).
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Allan Caffee (1):
|
||||
Documentation: update graph api example.
|
||||
|
||||
Carlo Marcelo Arenas Belon (1):
|
||||
documentation: update cvsimport description of "-r" for recent clone
|
||||
|
||||
Daniel Barkalow (1):
|
||||
Give error when no remote is configured
|
||||
|
||||
Daniel Cheng (aka SDiZ) (1):
|
||||
Fix bash completion in path with spaces
|
||||
|
||||
David Aguilar (1):
|
||||
everyday: use the dashless form of git-init
|
||||
|
||||
Emil Sit (1):
|
||||
test-lib: Clean up comments and Makefile.
|
||||
|
||||
Eric Wong (1):
|
||||
git-svn: fix ls-tree usage with dash-prefixed paths
|
||||
|
||||
Jeff King (2):
|
||||
doc: clarify how -S works
|
||||
ls-files: require worktree when --deleted is given
|
||||
|
||||
Johannes Schindelin (2):
|
||||
rsync transport: allow local paths, and fix tests
|
||||
import-zips: fix thinko
|
||||
|
||||
Johannes Sixt (1):
|
||||
diff --no-index: Do not generate patch output if other output is
|
||||
requested
|
||||
|
||||
Junio C Hamano (5):
|
||||
read-tree A B C: do not create a bogus index and do not segfault
|
||||
GIT 1.6.2.1
|
||||
Remove total confusion from git-fetch and git-push
|
||||
Update draft release notes to 1.6.2.2
|
||||
Update draft release notes to 1.6.2.2
|
||||
|
||||
Linus Torvalds (1):
|
||||
close_sha1_file(): make it easier to diagnose errors
|
||||
|
||||
Michael J Gruber (2):
|
||||
git submodule: Add test cases for git submodule add
|
||||
git submodule: Fix adding of submodules at paths with ./, .. and //
|
||||
|
||||
Nico -telmich- Schottelius (1):
|
||||
git-tag(1): add hint about commit messages
|
||||
|
||||
Nicolas Pitre (1):
|
||||
avoid possible overflow in delta size filtering computation
|
||||
|
||||
René Scharfe (3):
|
||||
diffcore-pickaxe: use memmem()
|
||||
optimize compat/ memmem()
|
||||
pickaxe: count regex matches only once
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
Increase the size of the die/warning buffer to avoid truncation
|
||||
|
||||
Stephen Boyd (1):
|
||||
format-patch: --numbered-files and --stdout aren't mutually exclusive
|
||||
|
||||
Thomas Rast (3):
|
||||
send-email: respect in-reply-to regardless of threading
|
||||
send-email: test --no-thread --in-reply-to combination
|
||||
bash completion: only show 'log --merge' if merging
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alex Riesen (4):
|
||||
disable post-checkout test on Cygwin
|
||||
Produce a nicer output in case of sha1_object_info failures in ls-tree -l
|
||||
Microoptimize strbuf_cmp
|
||||
Improve error message about fetch into current branch
|
||||
|
||||
Amos King (2):
|
||||
Do not name "repo" struct "remote" in push_http.c
|
||||
http-push.c: use a faux remote to pass to http_init
|
||||
|
||||
Arto Jonsson (1):
|
||||
bash completion: add options for 'git fsck'
|
||||
|
||||
Ben Walton (7):
|
||||
configure: ensure settings from user are also usable in the script
|
||||
configure: reorganize flow of argument checks
|
||||
configure: add macros to stash FLAG variables
|
||||
configure: wrap some library tests with GIT_STASH_FLAGS
|
||||
configure: asciidoc version test cleanup
|
||||
configure: make iconv tests aware of user arguments
|
||||
configure: rework pthread handling to allow for user defined flags
|
||||
|
||||
Benjamin Kramer (1):
|
||||
Fix various dead stores found by the clang static analyzer
|
||||
|
||||
Brandon Casey (2):
|
||||
git-branch: display "was sha1" on branch deletion rather than just "sha1"
|
||||
builtin-send-pack.c: avoid empty structure initialization
|
||||
|
||||
Brian Gernhardt (2):
|
||||
Create USE_ST_TIMESPEC and turn it on for Darwin
|
||||
Makefile: Set compiler switch for USE_NSEC
|
||||
|
||||
Carlos Rica (1):
|
||||
config: test for --replace-all with one argument and fix documentation.
|
||||
|
||||
Chris Johnsen (2):
|
||||
git-push.txt: describe how to default to pushing only current branch
|
||||
Documentation: remove extra quoting/emphasis around literal texts
|
||||
|
||||
Daniel Barkalow (7):
|
||||
Make clone parse the default refspec with the normal code
|
||||
Use a single function to match names against patterns
|
||||
Use the matching function to generate the match results
|
||||
Keep '*' in pattern refspecs
|
||||
Support '*' in the middle of a refspec
|
||||
Use a common function to get the pretty name of refs
|
||||
Move push matching and reporting logic into transport.c
|
||||
|
||||
David J. Mellor (12):
|
||||
Documentation: minor grammatical fixes in git-archive.txt.
|
||||
Documentation: reword the "Description" section of git-bisect.txt.
|
||||
Documentation: minor grammatical fixes in git-blame.txt.
|
||||
Documentation: minor grammatical fixes in git-branch.txt.
|
||||
Documentation: reworded the "Description" section of git-bisect.txt.
|
||||
Documentation: reword example text in git-bisect.txt.
|
||||
Documentation: remove some uses of the passive voice in git-bisect.txt
|
||||
Documentation: minor grammatical fixes and rewording in git-bundle.txt
|
||||
Documentation: minor grammatical fixes in git-cat-file.txt
|
||||
Documentation: minor grammatical fixes in git-check-attr.txt
|
||||
Documentation: minor grammatical fix in git-check-ref-format.txt
|
||||
Documentation: Remove spurious uses of "you" in git-bisect.txt.
|
||||
|
||||
Elijah Newren (3):
|
||||
git-filter-branch: avoid collisions with variables in eval'ed commands
|
||||
Correct missing SP characters in grammar comment at top of fast-import.c
|
||||
fast-export: Avoid dropping files from commits
|
||||
|
||||
Emil Sit (1):
|
||||
config.txt: Describe special 'none' handling in core.gitProxy.
|
||||
|
||||
Eric Wong (1):
|
||||
git-svn: fix ls-tree usage with dash-prefixed paths
|
||||
|
||||
Felipe Contreras (8):
|
||||
git_config(): not having a per-repo config file is not an error
|
||||
git config: trivial rename in preparation for parseopt
|
||||
git config: reorganize get_color*
|
||||
git config: reorganize to use parseopt
|
||||
git config: don't allow multiple config file locations
|
||||
git config: don't allow multiple variable types
|
||||
git config: don't allow extra arguments for -e or -l.
|
||||
git config: don't allow --get-color* and variable type
|
||||
|
||||
Finn Arne Gangstad (2):
|
||||
New config push.default to decide default behavior for push
|
||||
Display warning for default git push with no push.default config
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
import-tars: separate author from committer
|
||||
|
||||
Heiko Voigt (1):
|
||||
Add warning about known issues to documentation of cvsimport
|
||||
|
||||
Janos Laube (1):
|
||||
MinGW: implement mmap
|
||||
|
||||
Jay Soffian (20):
|
||||
move duplicated get_local_heads() to remote.c
|
||||
move duplicated ref_newer() to remote.c
|
||||
move locate_head() to remote.c
|
||||
remote: simplify guess_remote_head()
|
||||
remote: make copy_ref() perform a deep copy
|
||||
remote: let guess_remote_head() optionally return all matches
|
||||
remote: make match_refs() copy src ref before assigning to peer_ref
|
||||
remote: make match_refs() not short-circuit
|
||||
string-list: new for_each_string_list() function
|
||||
builtin-remote: refactor duplicated cleanup code
|
||||
builtin-remote: remove unused code in get_ref_states
|
||||
builtin-remote: rename variables and eliminate redundant function call
|
||||
builtin-remote: make get_remote_ref_states() always populate
|
||||
states.tracked
|
||||
builtin-remote: fix two inconsistencies in the output of "show <remote>"
|
||||
builtin-remote: teach show to display remote HEAD
|
||||
builtin-remote: add set-head subcommand
|
||||
builtin-remote: new show output style
|
||||
builtin-remote: new show output style for push refspecs
|
||||
send-email: refactor and ensure prompting doesn't loop forever
|
||||
send-email: add tests for refactored prompting
|
||||
|
||||
Jeff King (12):
|
||||
test scripts: refactor start_httpd helper
|
||||
add basic http clone/fetch tests
|
||||
refactor find_ref_by_name() to accept const list
|
||||
remote: make guess_remote_head() use exact HEAD lookup if it is available
|
||||
config: set help text for --bool-or-int
|
||||
t3000: use test_cmp instead of diff
|
||||
ls-files: fix broken --no-empty-directory
|
||||
ls-files: require worktree when --deleted is given
|
||||
make oneline reflog dates more consistent with multiline format
|
||||
remote: improve sorting of "configure for git push" list
|
||||
Makefile: turn on USE_ST_TIMESPEC for FreeBSD
|
||||
t0060: fix whitespace in "wc -c" invocation
|
||||
|
||||
Jens Lehmann (1):
|
||||
githooks documentation: post-checkout hook is also called after clone
|
||||
|
||||
Johannes Schindelin (7):
|
||||
Turn the flags in struct dir_struct into a single variable
|
||||
rebase -i: avoid 'git reset' when possible
|
||||
winansi: support ESC [ K (erase in line)
|
||||
gc --aggressive: make it really aggressive
|
||||
t7300: fix clean up on Windows
|
||||
Smudge the files fed to external diff and textconv
|
||||
Guard a few Makefile variables against user environments
|
||||
|
||||
Johannes Sixt (30):
|
||||
recv_sideband: Bands #2 and #3 always go to stderr
|
||||
t9400, t9401: Do not force hard-linked clone
|
||||
test suite: Use 'say' to say something instead of 'test_expect_success'
|
||||
Call 'say' outside test_expect_success
|
||||
test-lib: Replace uses of $(expr ...) by POSIX shell features.
|
||||
test-lib: Simplify test counting.
|
||||
test-lib: Introduce test_chmod and use it instead of update-index --chmod
|
||||
t2200, t7004: Avoid glob pattern that also matches files
|
||||
t5300, t5302, t5303: Do not use /dev/zero
|
||||
t5602: Work around path mangling on MSYS
|
||||
test-lib: Work around incompatible sort and find on Windows
|
||||
test-lib: Work around missing sum on Windows
|
||||
Tests on Windows: $(pwd) must return Windows-style paths
|
||||
t0050: Check whether git init detected symbolic link support correctly
|
||||
test-lib: Infrastructure to test and check for prerequisites
|
||||
Propagate --exec-path setting to external commands via GIT_EXEC_PATH
|
||||
t3600: Use test prerequisite tags
|
||||
Skip tests that fail if the executable bit is not handled by the
|
||||
filesystem
|
||||
t5302: Use prerequisite tags to skip 64-bit offset tests
|
||||
t9100, t9129: Use prerequisite tags for UTF-8 tests
|
||||
Use prerequisite tags to skip tests that depend on symbolic links
|
||||
t0060: Fix tests on Windows
|
||||
Skip tests that require a filesystem that obeys POSIX permissions
|
||||
t3700: Skip a test with backslashes in pathspec
|
||||
Use prerequisites to skip tests that need unzip
|
||||
t7004: Use prerequisite tags to skip tests that need gpg
|
||||
t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
|
||||
MinGW: Quote arguments for subprocesses that contain a single-quote
|
||||
t7005-editor: Use $SHELL_PATH in the editor scripts
|
||||
t7502-commit: Skip SIGTERM test on Windows
|
||||
|
||||
Junio C Hamano (15):
|
||||
Make git-clone respect branch.autosetuprebase
|
||||
builtin-remote.c: no "commented out" code, please
|
||||
Not all systems use st_[cm]tim field for ns resolution file timestamp
|
||||
grep: cast printf %.*s "precision" argument explicitly to int
|
||||
http.c: style cleanups
|
||||
Improve "git branch --tracking" output
|
||||
http_init(): Fix config file parsing
|
||||
http authentication via prompts
|
||||
http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of
|
||||
cURL
|
||||
Read attributes from the index that is being checked out
|
||||
Update draft release notes to 1.6.3
|
||||
blame: read custom grafts given by -S before calling setup_revisions()
|
||||
http tests: Darwin is not that special
|
||||
diff --cached: do not borrow from a work tree when a path is marked as
|
||||
assume-unchanged
|
||||
Update draft release notes to 1.6.3
|
||||
|
||||
Kevin Ballard (1):
|
||||
builtin-push.c: Fix typo: "anythig" -> "anything"
|
||||
|
||||
Kevin McConnell (1):
|
||||
Add --staged to bash completion for git diff
|
||||
|
||||
Kjetil Barvik (17):
|
||||
lstat_cache(): small cleanup and optimisation
|
||||
lstat_cache(): generalise longest_match_lstat_cache()
|
||||
lstat_cache(): swap func(length, string) into func(string, length)
|
||||
unlink_entry(): introduce schedule_dir_for_removal()
|
||||
create_directories(): remove some memcpy() and strchr() calls
|
||||
write_entry(): cleanup of some duplicated code
|
||||
write_entry(): use fstat() instead of lstat() when file is open
|
||||
show_patch_diff(): remove a call to fstat()
|
||||
lstat_cache(): print a warning if doing ping-pong between cache types
|
||||
check_updates(): effective removal of cache entries marked CE_REMOVE
|
||||
fix compile error when USE_NSEC is defined
|
||||
make USE_NSEC work as expected
|
||||
verify_uptodate(): add ce_uptodate(ce) test
|
||||
write_index(): update index_state->timestamp after flushing to disk
|
||||
Record ns-timestamps if possible, but do not use it without USE_NSEC
|
||||
checkout bugfix: use stat.mtime instead of stat.ctime in two places
|
||||
Revert "lstat_cache(): print a warning if doing ping-pong between cache
|
||||
types"
|
||||
|
||||
Kristian Amlie (1):
|
||||
Add a test for checking whether gitattributes is honored by checkout.
|
||||
|
||||
Michael J Gruber (3):
|
||||
test-lib.sh: Test for presence of git-init in the right path.
|
||||
test-lib.sh: Allow running the test suite against installed git
|
||||
git-branch.txt: document -f correctly
|
||||
|
||||
Michele Ballabio (6):
|
||||
apply: consistent spelling of "don't"
|
||||
apply: hide unused options from short help
|
||||
git log: avoid segfault with --all-match
|
||||
document --force-rebase
|
||||
rebase: add options passed to git-am
|
||||
rebase: fix typo (force_rebas -> force-rebas)
|
||||
|
||||
Miklos Vajna (11):
|
||||
parse-opt: migrate builtin-ls-files.
|
||||
Tests: use test_cmp instead of diff where possible
|
||||
http-push: using error() and warning() as appropriate
|
||||
builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
|
||||
builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
|
||||
builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
|
||||
builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
|
||||
builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
|
||||
builtin-show-branch: use warning() instead of fprintf(stderr, "warning:
|
||||
")
|
||||
builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
|
||||
refs: use warning() instead of fprintf(stderr, "warning: ")
|
||||
|
||||
Nate Case (1):
|
||||
format-patch: Respect --quiet option
|
||||
|
||||
Nguyễn Thái Ngọc Duy (1):
|
||||
grep: prefer builtin over external one when coloring results
|
||||
|
||||
Petr Kodl (2):
|
||||
MinGW: a helper function that translates Win32 API error codes
|
||||
MinGW: a hardlink implementation
|
||||
|
||||
René Scharfe (6):
|
||||
grep: micro-optimize hit collection for AND nodes
|
||||
grep: remove grep_opt argument from match_expr_eval()
|
||||
grep: add pmatch and eflags arguments to match_one_pattern()
|
||||
grep: color patterns in output
|
||||
grep: add support for coloring with external greps
|
||||
pickaxe: count regex matches only once
|
||||
|
||||
Santi Béjar (2):
|
||||
Documentation: enhance branch.<name>.{remote,merge}
|
||||
Documentation: push.default applies to all remotes
|
||||
|
||||
Simon Arlott (1):
|
||||
git-svn: don't output git commits in quiet mode
|
||||
|
||||
Stephen Boyd (4):
|
||||
git-send-email.txt: describe --compose better
|
||||
completion: add --annotate option to send-email
|
||||
completion: add --cc and --no-attachment option to format-patch
|
||||
completion: add --thread=deep/shallow to format-patch
|
||||
|
||||
Wincent Colaiuta (2):
|
||||
Grammar fixes to "merge" and "patch-id" docs
|
||||
Grammar fix for "git merge" man page
|
||||
|
||||
@@ -1,228 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Apr 2009, #01; Thu, 09)
|
||||
X-maint-at: db12d97542762cdb54d332ea047122f1071132b5
|
||||
X-master-at: e37347bba651f051998f23a3701b555f1a194557
|
||||
X-maint-was: 8c7f78823888306c1cceafcf5fd26739eef99ce3
|
||||
X-master-was: 442dd42d6d4903640b0dc5561481a77c88dcea90
|
||||
|
||||
What's in git.git (Apr 2009, #01; Thu, 09)
|
||||
|
||||
maint db12d97 (Start 1.6.2.3 preparation)
|
||||
master e37347b (Update draft release notes to 1.6.3)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
We have quite a few documentation fixes accumulated on the maint branch
|
||||
perhaps a new maintenance release 1.6.2.3 mid next week.
|
||||
|
||||
On the 'master' front, there are currently 6 topics cooking in 'next', all
|
||||
of which look quite good. I'll probably tag 1.6.3-rc0 this weekend with
|
||||
most of these topics and keep cooking the rest for 1.6.4 cycle.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Björn Steinbrink (1):
|
||||
process_{tree,blob}: Remove useless xstrdup calls
|
||||
|
||||
Brandon Casey (7):
|
||||
t7700-repack: add two new tests demonstrating repacking flaws
|
||||
git-repack.sh: don't use --kept-pack-only option to pack-objects
|
||||
pack-objects: only repack or loosen objects residing in "local" packs
|
||||
Remove --kept-pack-only option and associated infrastructure
|
||||
git-branch: display "was sha1" on branch deletion rather than just "sha1"
|
||||
t7700: demonstrate repack flaw which may loosen objects unnecessarily
|
||||
pack-objects: don't loosen objects available in alternate or kept packs
|
||||
|
||||
Dan McGee (1):
|
||||
git-repack: use non-dashed update-server-info
|
||||
|
||||
David J. Mellor (12):
|
||||
Documentation: minor grammatical fixes in git-archive.txt.
|
||||
Documentation: reword the "Description" section of git-bisect.txt.
|
||||
Documentation: minor grammatical fixes in git-blame.txt.
|
||||
Documentation: minor grammatical fixes in git-branch.txt.
|
||||
Documentation: reworded the "Description" section of git-bisect.txt.
|
||||
Documentation: reword example text in git-bisect.txt.
|
||||
Documentation: remove some uses of the passive voice in git-bisect.txt
|
||||
Documentation: minor grammatical fixes and rewording in git-bundle.txt
|
||||
Documentation: minor grammatical fixes in git-cat-file.txt
|
||||
Documentation: minor grammatical fixes in git-check-attr.txt
|
||||
Documentation: minor grammatical fix in git-check-ref-format.txt
|
||||
Documentation: Remove spurious uses of "you" in git-bisect.txt.
|
||||
|
||||
Holger Weiß (1):
|
||||
Documentation: Remove an odd "instead"
|
||||
|
||||
Jari Aalto (1):
|
||||
Change double quotes to single quotes in message
|
||||
|
||||
Jason Merrill (1):
|
||||
Documentation: clarify .gitattributes search
|
||||
|
||||
Jeff King (3):
|
||||
fix portability problem with IS_RUN_COMMAND_ERR
|
||||
t1301: loosen test for forced modes
|
||||
commit: abort commit if interactive add failed
|
||||
|
||||
Johan Herland (1):
|
||||
Move chmod(foo, 0444) into move_temp_to_file()
|
||||
|
||||
Johannes Schindelin (2):
|
||||
Smudge the files fed to external diff and textconv
|
||||
mailmap: resurrect lower-casing of email addresses
|
||||
|
||||
Johannes Sixt (1):
|
||||
Propagate --exec-path setting to external commands via GIT_EXEC_PATH
|
||||
|
||||
Julien Danjou (1):
|
||||
git submodule: fix usage line
|
||||
|
||||
Junio C Hamano (13):
|
||||
git-repack: resist stray environment variable
|
||||
has_sha1_pack(): refactor "pretend these packs do not exist" interface
|
||||
has_sha1_kept_pack(): take "struct rev_info"
|
||||
Consolidate ignore_packed logic more
|
||||
Simplify is_kept_pack()
|
||||
is_kept_pack(): final clean-up
|
||||
blame: read custom grafts given by -S before calling setup_revisions()
|
||||
diff --cached: do not borrow from a work tree when a path is marked as
|
||||
assume-unchanged
|
||||
"core.sharedrepository = 0mode" should set, not loosen
|
||||
move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
|
||||
set_shared_perm(): sometimes we know what the final mode bits should look
|
||||
like
|
||||
GIT 1.6.2.2
|
||||
Start 1.6.2.3 preparation
|
||||
|
||||
Markus Heidelberg (1):
|
||||
doc/git-pack-refs: fix two grammar issues
|
||||
|
||||
Matthieu Moy (3):
|
||||
git-checkout.txt: fix incorrect statement about HEAD and index
|
||||
git-checkout.txt: clarify that <branch> applies when no path is given.
|
||||
git-pull.sh: better warning message for "git pull" on detached head.
|
||||
|
||||
Thomas Rast (1):
|
||||
Documentation: format-patch --root clarifications
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Ali Gholami Rudi (2):
|
||||
builtin-clone.c: make junk_pid static
|
||||
builtin-clone.c: no need to strdup for setenv
|
||||
|
||||
Björn Steinbrink (2):
|
||||
Mailmap: Allow empty email addresses to be mapped
|
||||
tree_entry_interesting: a pathspec only matches at directory boundary
|
||||
|
||||
Chris Johnsen (11):
|
||||
Documentation/Makefile: make most operations "quiet"
|
||||
Documentation/Makefile: break up texi pipeline
|
||||
Documentation: move callouts.xsl to manpage-{base,normal}.xsl
|
||||
Documentation: use parametrized manpage-base.xsl with
|
||||
manpage-{1.72,normal}.xsl
|
||||
Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff
|
||||
Documentation: move quieting params into manpage-base.xsl
|
||||
Documentation: move "spurious .sp" code into manpage-base.xsl
|
||||
Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
|
||||
Documentation: asciidoc.conf: fix verse block with block titles
|
||||
Documentation: option to render literal text as bold for manpages
|
||||
Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
|
||||
|
||||
Christian Couder (2):
|
||||
log-tree: fix patch filename computation in "git format-patch"
|
||||
bisect: improve error message when branch checkout fails
|
||||
|
||||
Clemens Buchacher (3):
|
||||
add tests for merging with submodules
|
||||
update cache for conflicting submodule entries
|
||||
simplify output of conflicting merge
|
||||
|
||||
Erik Faye-Lund (4):
|
||||
test-suite: adding a test for fast-export with tag variants
|
||||
builtin-fast-export.c: turn error into warning
|
||||
builtin-fast-export.c: fix crash on tagged trees
|
||||
builtin-fast-export.c: handle nested tags
|
||||
|
||||
Felipe Contreras (3):
|
||||
user-manual: remove some git-foo usage
|
||||
docbook: change css style
|
||||
user-manual: the name of the hash function is SHA-1, not sha1
|
||||
|
||||
Heiko Voigt (2):
|
||||
Cleanup warning about known issues in cvsimport documentation
|
||||
Add configuration variable for sign-off to format-patch
|
||||
|
||||
Jay Soffian (5):
|
||||
send-email: don't attempt to prompt if tty is closed
|
||||
send-email: ask_default should apply to all emails, not just the first
|
||||
send-email: correct two tests which were going interactive
|
||||
send-email: ensure quoted addresses are rfc2047 encoded
|
||||
send-email: fix nasty bug in ask() function
|
||||
|
||||
Jeff King (1):
|
||||
tests: remove exit after test_done call
|
||||
|
||||
Johannes Schindelin (1):
|
||||
Fix 'git checkout <submodule>' to update the index
|
||||
|
||||
Junio C Hamano (10):
|
||||
Rename interpret/substitute nth_last_branch functions
|
||||
strbuf_branchname(): a wrapper for branch name shorthands
|
||||
check-ref-format --branch: give Porcelain a way to grok branch shorthand
|
||||
Fix branch -m @{-1} newname
|
||||
strbuf_check_branch_ref(): a helper to check a refname for a branch
|
||||
check_ref_format(): tighten refname rules
|
||||
match_tree_entry(): a pathspec only matches at directory boundaries
|
||||
Update draft release notes to 1.6.3
|
||||
Update draft release notes to 1.6.3
|
||||
Speed up reflog pruning of unreachable commits
|
||||
|
||||
Kjetil Barvik (1):
|
||||
stat_tracking_info(): only count real commits
|
||||
|
||||
Linus Torvalds (1):
|
||||
Clean up reflog unreachability pruning decision
|
||||
|
||||
Markus Heidelberg (1):
|
||||
add --html-path to get the location of installed HTML docs
|
||||
|
||||
Martin Storsjö (1):
|
||||
Allow curl to rewind the read buffers
|
||||
|
||||
Matthieu Moy (2):
|
||||
git-send-email.txt: clarify which options take an argument.
|
||||
git-rev-list.txt: make ascii markup uniform with other pages.
|
||||
|
||||
Michael Hendricks (1):
|
||||
format-patch: add arbitrary email headers
|
||||
|
||||
Michael J Gruber (2):
|
||||
Test for local branches being followed with --track
|
||||
Make local branches behave like remote branches when --tracked
|
||||
|
||||
Santi Béjar (1):
|
||||
Documentation: branch.*.merge can also affect 'git-push'
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
Don't permit ref/branch names to end with ".lock"
|
||||
|
||||
Simon Arlott (1):
|
||||
git-svn: add a double quiet option to hide git commits
|
||||
|
||||
Stephen Boyd (7):
|
||||
pretty.c: add %f format specifier to format_commit_message()
|
||||
format-patch: construct patch filename in one function
|
||||
format-patch: pass a commit to reopen_stdout()
|
||||
format-patch: move get_patch_filename() into log-tree
|
||||
format-patch: --attach/inline uses filename instead of SHA1
|
||||
format-patch: --numbered-files and --stdout aren't mutually exclusive
|
||||
format_sanitized_subject: Don't trim past initial length of strbuf
|
||||
|
||||
Todd Zullinger (1):
|
||||
bash completion: Update 'git am' options
|
||||
|
||||
Wesley J. Landaker (1):
|
||||
Documentation: git-svn: fix trunk/fetch svn-remote key typo
|
||||
|
||||
@@ -1,282 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Apr 2009, #02; Wed, 29)
|
||||
X-maint-at: a2dc04ba159def766ee17db00c60bdbda477955d
|
||||
X-master-at: 6ffd567bec439e7809ee0966556bd5e72fb78de4
|
||||
X-maint-was: 3bd1bb327eb4d3e386800897734f9f42b48280ff
|
||||
X-master-was: c965c029330b1f81cc107c5d829e7fd79c61d8ea
|
||||
|
||||
What's in git.git (Apr 2009, #02; Wed, 29)
|
||||
|
||||
maint a2dc04b (Merge branch 'maint-1.6.1' into maint)
|
||||
master 6ffd567 (improve error message in config.c)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
It's been a while since I sent the "What's in" report. Hopefully we can
|
||||
do an -rc4 this weekend and then 1.6.3 final next week.
|
||||
|
||||
* The 'maint' branch has these fixes since 1.6.2.3
|
||||
|
||||
Allan Caffee (2):
|
||||
builtin-merge: fix a typo in an error message
|
||||
Documentation: fix a grammatical error in api-builtin.txt
|
||||
|
||||
Björn Steinbrink (1):
|
||||
tree_entry_interesting: a pathspec only matches at directory boundary
|
||||
|
||||
Clemens Buchacher (3):
|
||||
add tests for merging with submodules
|
||||
update cache for conflicting submodule entries
|
||||
simplify output of conflicting merge
|
||||
|
||||
Erik Faye-Lund (4):
|
||||
test-suite: adding a test for fast-export with tag variants
|
||||
builtin-fast-export.c: turn error into warning
|
||||
builtin-fast-export.c: fix crash on tagged trees
|
||||
builtin-fast-export.c: handle nested tags
|
||||
|
||||
Frank Lichtenheld (2):
|
||||
init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
|
||||
gitcvs-migration: Link to git-cvsimport documentation
|
||||
|
||||
Jeff King (2):
|
||||
doc/gitattributes: clarify location of config text
|
||||
add-interactive: refactor mode hunk handling
|
||||
|
||||
Johan Herland (1):
|
||||
Update docs on behaviour of 'core.sharedRepository' and 'git init
|
||||
--shared'
|
||||
|
||||
Johannes Schindelin (2):
|
||||
Fix 'git checkout <submodule>' to update the index
|
||||
Fix off-by-one in read_tree_recursive
|
||||
|
||||
Johannes Sixt (1):
|
||||
t1301-shared-repo: fix forced modes test
|
||||
|
||||
Junio C Hamano (4):
|
||||
match_tree_entry(): a pathspec only matches at directory boundaries
|
||||
Describe fixes since 1.6.2.3
|
||||
GIT 1.6.2.4
|
||||
diff -c -p: do not die on submodules
|
||||
|
||||
Junio Hamano (1):
|
||||
Speed up reflog pruning of unreachable commits
|
||||
|
||||
Linus Torvalds (2):
|
||||
Clean up reflog unreachability pruning decision
|
||||
grep: fix segfault when "git grep '('" is given
|
||||
|
||||
Markus Heidelberg (2):
|
||||
doc/git-daemon: add missing arguments to options
|
||||
doc/git-daemon: add missing arguments to max-connections option
|
||||
|
||||
Matthieu Moy (2):
|
||||
git add -p: new "quit" command at the prompt.
|
||||
Update git-add.txt according to the new possibilities of 'git add -p'.
|
||||
|
||||
Nguyễn Thái Ngọc Duy (1):
|
||||
Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
|
||||
|
||||
Paul Bolle (1):
|
||||
imap-send: use correct configuration variable in documentation
|
||||
|
||||
Stephen Boyd (1):
|
||||
test-genrandom: Add newline to usage string
|
||||
|
||||
Thomas Jarosch (1):
|
||||
Fix buffer overflow in config parser
|
||||
|
||||
Ulrich Windl (1):
|
||||
git-apply: fix option description
|
||||
|
||||
|
||||
* The 'master' branch has these since 1.6.3-rc0
|
||||
in addition to the above.
|
||||
|
||||
Alex Riesen (3):
|
||||
Wait for git diff to finish in git difftool
|
||||
Explain seemingly pointless use of system in difftool
|
||||
improve error message in config.c
|
||||
|
||||
Allan Caffee (4):
|
||||
graph API: Added logic for colored edges
|
||||
t4202-log: extend test coverage of graphing
|
||||
graph API: fix extra space during pre_commit_line state
|
||||
graph API: fix a bug in the rendering of octopus merges
|
||||
|
||||
Ben Jackson (1):
|
||||
Work around ash "alternate value" expansion bug
|
||||
|
||||
Benjamin Kramer (2):
|
||||
connect: replace inet_ntop with getnameinfo
|
||||
daemon.c: fix segfault on OS X
|
||||
|
||||
Bert Wesarg (3):
|
||||
shorten_unambiguous_ref(): add strict mode
|
||||
for-each-ref: utilize core.warnAmbiguousRefs for :short-format
|
||||
rev-parse: --abbrev-ref option to shorten ref name
|
||||
|
||||
Bill Pemberton (1):
|
||||
Add parsing of elm aliases to git-send-email
|
||||
|
||||
Brandon Casey (2):
|
||||
t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
|
||||
t7700-repack: repack -a now works properly, expect success from test
|
||||
|
||||
Dan Loewenherz (1):
|
||||
Convert to use quiet option when available
|
||||
|
||||
David Aguilar (11):
|
||||
difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
|
||||
difftool: remove the backup file feature
|
||||
difftool: use perl built-ins when testing for msys
|
||||
difftool: add a -y shortcut for --no-prompt
|
||||
difftool: move 'git-difftool' out of contrib
|
||||
difftool: add various git-difftool tests
|
||||
difftool: add support for a difftool.prompt config variable
|
||||
bash completion: add git-difftool
|
||||
mergetool: use $( ... ) instead of `backticks`
|
||||
difftool/mergetool: refactor commands to use git-mergetool--lib
|
||||
mergetool--lib: simplify API usage by removing more global variables
|
||||
|
||||
Eric Blake (2):
|
||||
Makefile: installing git in cygwin 1.7.0
|
||||
doc: consistently use ASCIIDOC_EXTRA
|
||||
|
||||
Erik Broes (1):
|
||||
git-shell: Add 'git-upload-archive' to allowed commands.
|
||||
|
||||
Felipe Contreras (1):
|
||||
git config: error when editing a repo config and not being in one
|
||||
|
||||
Ferry Huberts (1):
|
||||
Fix misspelled mergetool.keepBackup
|
||||
|
||||
Holger Weiß (1):
|
||||
gitweb: Fix snapshots requested via PATH_INFO
|
||||
|
||||
Jeff King (8):
|
||||
doc: clarify --no-track option
|
||||
doc: refer to tracking configuration as "upstream"
|
||||
doc/checkout: refer to git-branch(1) as appropriate
|
||||
doc/checkout: split checkout and branch creation in synopsis
|
||||
docs/checkout: clarify what "non-branch" means
|
||||
add-interactive: refactor mode hunk handling
|
||||
t7800: respect NO_PERL
|
||||
Makefile: fix NO_PERL bug with gitweb
|
||||
|
||||
Johannes Schindelin (3):
|
||||
Add an option not to use link(src, dest) && unlink(src) when that is
|
||||
unreliable
|
||||
t5701: do not get stuck in empty-push/
|
||||
Rename core.unreliableHardlinks to core.createObject
|
||||
|
||||
Johannes Sixt (5):
|
||||
Windows: Work around intermittent failures in mingw_rename
|
||||
Windows: Skip fstat/lstat optimization in write_entry()
|
||||
builtin-help: silently tolerate unknown keys
|
||||
remote.c: do not trigger remote.<name>.<var> codepath for two-level names
|
||||
prune-packed: advanced progress even for non-existing fan-out directories
|
||||
|
||||
Junio C Hamano (11):
|
||||
gitignore git-bisect--helper
|
||||
unpack-trees: do not muck with attributes when we are not checking out
|
||||
Update draft release notes to 1.6.3
|
||||
read-tree A B: do not corrupt cache-tree
|
||||
Move prime_cache_tree() to cache-tree.c
|
||||
read-tree -m A B: prime cache-tree from the switched-to tree
|
||||
checkout branch: prime cache-tree fully
|
||||
Revert "stat_tracking_info(): only count real commits"
|
||||
Makefile: ignore perl/ subdirectory under NO_PERL
|
||||
GIT 1.6.3-rc2
|
||||
merge-recursive: do not die on a conflicting submodule
|
||||
|
||||
Linus Torvalds (4):
|
||||
Allow users to un-configure rename detection
|
||||
process_{tree,blob}: show objects without buffering
|
||||
show_object(): push path_name() call further down
|
||||
t4202: fix typo
|
||||
|
||||
Mark Drago (1):
|
||||
Add semicolon to curly brace group in main Makefile
|
||||
|
||||
Markus Heidelberg (4):
|
||||
doc/merge-config: list ecmerge as a built-in merge tool
|
||||
git-mergetool/difftool: make (g)vimdiff workable under Windows
|
||||
git-mergetool: add new merge tool TortoiseMerge
|
||||
grep: don't support "grep.color"-like config options
|
||||
|
||||
Matthieu Moy (3):
|
||||
git add -p: new "quit" command at the prompt.
|
||||
Update git-add.txt according to the new possibilities of 'git add -p'.
|
||||
clone: add test for push on an empty clone.
|
||||
|
||||
Michael J Gruber (3):
|
||||
remote.c: use shorten_unambiguous_ref
|
||||
test-lib.sh: Help test_create_repo() find the templates dir
|
||||
Fix more typos/spelling in comments
|
||||
|
||||
Michał Kiedrowicz (6):
|
||||
tests: test applying criss-cross rename patch
|
||||
builtin-apply: keep information about files to be deleted
|
||||
Documentation: boolean value may be given by on/off
|
||||
tests: test applying criss-cross rename patch
|
||||
builtin-apply: keep information about files to be deleted
|
||||
tests: make test-apply-criss-cross-rename more robust
|
||||
|
||||
Mike Ralphson (3):
|
||||
builtin-remote: fix typo in option description
|
||||
Documentation: fix typos / spelling mistakes
|
||||
Fix typos / spelling in comments
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
git-am: teach git-am to apply a patch to an unborn branch
|
||||
|
||||
Nguyễn Thái Ngọc Duy (3):
|
||||
get_local_heads(): do not return random pointer if there is no head
|
||||
attr: add GIT_ATTR_INDEX "direction"
|
||||
archive: do not read .gitattributes in working directory
|
||||
|
||||
Nicolas Pitre (1):
|
||||
progress bar: round to the nearest instead of truncating down
|
||||
|
||||
Patrick Welche (1):
|
||||
NetBSD compilation fix
|
||||
|
||||
Pierre Habouzit (1):
|
||||
hook/update: example of how to prevent branch creation
|
||||
|
||||
René Scharfe (2):
|
||||
archive tests: do not use .gitattributes in working directory
|
||||
archive test: attributes
|
||||
|
||||
Sam Vilain (1):
|
||||
SubmittingPatches: itemize and reflect upon well written changes
|
||||
|
||||
Sebastian Pipping (1):
|
||||
difftool/mergetool: add diffuse as merge and diff tool
|
||||
|
||||
Sitaram Chamarty (1):
|
||||
Remove obsolete bug warning in man git-update-server-info
|
||||
|
||||
Stephen Boyd (7):
|
||||
config.txt: add missing format.{subjectprefix,cc,attach} variables
|
||||
Documentation: use lowercase for shallow and deep threading
|
||||
git-show-branch.txt: cleanup example description
|
||||
git-format-patch.txt: general rewordings and cleanups
|
||||
config.txt: add missing 'the's and make words plural
|
||||
config.txt: clarify sentences in the configuration and syntax sections
|
||||
config.txt: Make configuration paragraph more consistent
|
||||
|
||||
Uwe Kleine-König (1):
|
||||
parseopt: fix documentation for --keep-dashdash
|
||||
|
||||
Wesley J. Landaker (4):
|
||||
Documentation: git-svn: fix spurious bolding that mangles the output
|
||||
Documentation: git-svn: fix a grammatical error without awkwardness
|
||||
Documentation: git-clean: fix minor grammatical errors
|
||||
Documentation: git-clean: make description more readable
|
||||
|
||||
Wincent Colaiuta (1):
|
||||
git add -p: add missing "q" to patch prompt
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (May 2009, #01; Sat, 09)
|
||||
X-maint-at: ec00d6e0038e030cf73182374e21025c2776cb23
|
||||
X-master-at: 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0
|
||||
X-maint-was: f01f1099f40f24fe6f7802185340a6fa3a3d4f35
|
||||
X-master-was: f01f1099f40f24fe6f7802185340a6fa3a3d4f35
|
||||
|
||||
What's in git.git (May 2009, #01; Sat, 09)
|
||||
|
||||
maint ec00d6e (Documentation: cloning to empty directory is allowed)
|
||||
master 6345d7a (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
1.6.3 is out; 'maint' branch is now for 1.6.3.X maintenance series.
|
||||
|
||||
* The 'maint' branch has these fixes since v1.6.3.
|
||||
|
||||
Alex Riesen (1):
|
||||
Clarify kind of conflict in merge-one-file helper
|
||||
|
||||
Alexander Potashev (1):
|
||||
Documentation: cloning to empty directory is allowed
|
||||
|
||||
Felipe Contreras (1):
|
||||
git config: clarify --add and --get-color
|
||||
|
||||
Junio C Hamano (2):
|
||||
Start 1.6.3.1 maintenance series.
|
||||
archive-tar.c: squelch a type mismatch warning
|
||||
|
||||
|
||||
* The 'master' branch has these since v1.6.3, in addition to the above.
|
||||
|
||||
Jakub Narebski (1):
|
||||
gitweb: Remove function prototypes (cleanup)
|
||||
|
||||
Junio C Hamano (1):
|
||||
Start 1.6.4 development
|
||||
|
||||
Sitaram Chamarty (1):
|
||||
allow -t abbreviation for --track in git branch
|
||||
|
||||
@@ -1,218 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (May 2009, #02; Sat, 23)
|
||||
X-maint-at: e701fadb9e0e51a6811690d95a53bd1f5b6fad86
|
||||
X-master-at: b74d779bd90477f6514d0a9be4a75b4c40ed946c
|
||||
X-maint-was: ec00d6e0038e030cf73182374e21025c2776cb23
|
||||
X-master-was: 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0
|
||||
|
||||
What's in git.git (May 2009, #02; Sat, 23)
|
||||
|
||||
maint e701fad (grep: fix word-regexp colouring)
|
||||
master b74d779 (MinGW: Fix compiler warning in merge-recursive)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Many topics that have been cooking in 'next' are now in 'master'.
|
||||
Numerous small-ish documentation and fixes have been queued in 'maint',
|
||||
which may warrant 1.6.3.2.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Alex Riesen (2):
|
||||
ls-tree manpage: use "unless" instead of "when ... is not"
|
||||
ls-tree manpage: output of ls-tree is compatible with update-index
|
||||
|
||||
Dan McGee (1):
|
||||
Fix type-punning issues
|
||||
|
||||
Daniel Cordero (1):
|
||||
builtin-checkout: Don't tell user that HEAD has moved before it has
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
completion: use git rev-parse to detect bare repos
|
||||
|
||||
Jeff King (1):
|
||||
for-each-ref: fix segfault in copy_email
|
||||
|
||||
Jim Meyering (1):
|
||||
pre-commit.sample: don't print incidental SHA1
|
||||
|
||||
Johannes Schindelin (1):
|
||||
Cope better with a _lot_ of packs
|
||||
|
||||
Junio C Hamano (5):
|
||||
Revert "checkout branch: prime cache-tree fully"
|
||||
GIT 1.6.3.1
|
||||
completion: fix PS1 display during a merge on detached HEAD
|
||||
completion: simplify "current branch" in __git_ps1()
|
||||
completion: enhance "current branch" display
|
||||
|
||||
Linus Torvalds (1):
|
||||
dir.c: clean up handling of 'path' parameter in
|
||||
read_directory_recursive()
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
test: checkout shouldn't say that HEAD has moved if it didn't
|
||||
|
||||
René Scharfe (1):
|
||||
grep: fix word-regexp colouring
|
||||
|
||||
Stephen Boyd (4):
|
||||
api-parse-options.txt: use 'func' instead of 'funct'
|
||||
tests: Add tests for missing format-patch long options
|
||||
completion: add missing options to show-branch and show
|
||||
show-branch: Fix die message in parse_reflog_param()
|
||||
|
||||
Tony Kemp (1):
|
||||
Turn on USE_ST_TIMESPEC for OpenBSD
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alex Riesen (7):
|
||||
Introduce an unlink(2) wrapper which gives warning if unlink failed
|
||||
replace direct calls to unlink(2) with unlink_or_warn
|
||||
print unlink(2) errno in copy_or_link_directory
|
||||
Clarify kind of conflict in merge-one-file helper
|
||||
Quote LF in urls git fetch saves in FETCH_HEAD
|
||||
Use UTF-8 instead of utf8 for backward compatibility
|
||||
Improve the naming of guessed target repository for git clone
|
||||
|
||||
Alex Vandiver (3):
|
||||
git-svn: Fix for svn paths removed > log-window-size revisions ago
|
||||
git-svn: Correctly report max revision when following deleted paths
|
||||
git-svn: Set svn.authorsfile if it is passed to git svn clone
|
||||
|
||||
Allan Caffee (1):
|
||||
graph API: Use horizontal lines for more compact graphs
|
||||
|
||||
Andreas Ericsson (1):
|
||||
fetch: Strip usernames from url's before storing them
|
||||
|
||||
Christian Couder (20):
|
||||
rev-list: make "estimate_bisect_steps" non static
|
||||
rev-list: refactor printing bisect vars
|
||||
bisect: move common bisect functionality to "bisect_common"
|
||||
bisect--helper: add "--next-exit" to output bisect results
|
||||
bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
|
||||
bisect--helper: remove "--next-vars" option as it is now useless
|
||||
rev-list: remove stringed output flag from "show_bisect_vars"
|
||||
rev-parse: add --sq-quote to shell quote arguments
|
||||
bisect: use "git rev-parse --sq-quote" instead of a custom "sq" function
|
||||
am: simplify "sq" function by using "git rev-parse --sq-quote"
|
||||
bisect: use "sha1_array" to store skipped revisions
|
||||
bisect: implement "rev_argv_push" to fill an argv with revs
|
||||
bisect: store good revisions in a "sha1_array"
|
||||
bisect: use new "struct argv_array" to prepare argv for "setup_revisions"
|
||||
bisect: remove too much function nesting
|
||||
bisect: make skipped array functions more generic
|
||||
bisect: automatically sort sha1_array if needed when looking it up
|
||||
bisect: implement the "check_merge_bases" function
|
||||
bisect: add "check_good_are_ancestors_of_bad" function
|
||||
bisect: make "git bisect" use new "--next-all" bisect-helper function
|
||||
|
||||
Dan McGee (1):
|
||||
Unify signedness in hashing calls
|
||||
|
||||
Dave Olszewski (1):
|
||||
merge-recursive: never leave index unmerged while recursing
|
||||
|
||||
David Aguilar (1):
|
||||
mergetool--lib: specialize diff options for emerge and ecmerge
|
||||
|
||||
Eric W. Biederman (1):
|
||||
git-send-email: Handle quotes when parsing .mailrc files
|
||||
|
||||
Eygene Ryabinkin (1):
|
||||
git-svn testsuite: use standard configuration for Subversion tools
|
||||
|
||||
Felipe Contreras (2):
|
||||
Change prettify_ref to prettify_refname
|
||||
Prettify log decorations even more
|
||||
|
||||
Frank Lichtenheld (2):
|
||||
Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
|
||||
Git.pm: Always set Repository to absolute path if autodetecting
|
||||
|
||||
Heiko Voigt (2):
|
||||
Extend sample update hook, disable modifying of existing tags
|
||||
Extend sample pre-commit hook to check for non ascii filenames
|
||||
|
||||
Jakub Narebski (9):
|
||||
gitweb: Do not use bareword filehandles
|
||||
gitweb: Always use three argument form of open
|
||||
gitweb: Always use three argument form of open
|
||||
gitweb: Use block form of map/grep in a few cases more
|
||||
gitweb: Replace wrongly added tabs with spaces
|
||||
gitweb: Use capturing parentheses only when you intend to capture
|
||||
gitweb: Simplify snapshot format detection logic in evaluate_path_info
|
||||
gitweb: Remove unused $hash_base parameter from normalize_link_target
|
||||
gitweb: Sanitize title attribute in format_subject_html
|
||||
|
||||
Jeff King (3):
|
||||
parseopt: add OPT_NEGBIT
|
||||
fix GIT_TRACE segfault with shell-quoted aliases
|
||||
add: don't complain when adding empty project root
|
||||
|
||||
Jim Meyering (1):
|
||||
format-patch let -k override a config-specified format.numbered
|
||||
|
||||
Johannes Schindelin (7):
|
||||
git-add: introduce --edit (to edit the diff vs. the index)
|
||||
t3702: fix reliance on SHELL_PATH being '/bin/sh'
|
||||
Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
|
||||
MinGW: the path separator to split GITPERLLIB is ';' on Win32
|
||||
MinGW: use POSIX signature of waitpid()
|
||||
MinGW: Add a simple getpass()
|
||||
MinGW: Fix compiler warning in merge-recursive
|
||||
|
||||
Junio C Hamano (1):
|
||||
t3900: ISO-2022-JP has more than one popular variants
|
||||
|
||||
Linus Torvalds (2):
|
||||
Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
|
||||
Teach 'git checkout' to preload the index contents
|
||||
|
||||
Mark Lodato (1):
|
||||
git-svn: add --authors-prog option
|
||||
|
||||
Markus Heidelberg (3):
|
||||
show-branch: color the commit status signs
|
||||
bash completion: show-branch color support
|
||||
diff: do not color --stat output like patch context
|
||||
|
||||
Michael J Gruber (3):
|
||||
Documentation: clarify / requirement in 'git check-ref-format'
|
||||
Test tracking of non-commit upstreams
|
||||
Fix behavior with non-commit upstream references
|
||||
|
||||
Michael S. Tsirkin (1):
|
||||
Add --reference option to git submodule.
|
||||
|
||||
Nguyễn Thái Ngọc Duy (2):
|
||||
doc/git-rebase.txt: remove mention of multiple strategies
|
||||
Terminate argv with NULL before calling setup_revisions()
|
||||
|
||||
Nicolas Pitre (1):
|
||||
allow OFS_DELTA objects during a push
|
||||
|
||||
Peter Harris (1):
|
||||
MinGW: Scan for \r in addition to \n when reading shbang lines
|
||||
|
||||
René Scharfe (6):
|
||||
parseopt: add OPT_NEGBIT
|
||||
parseopt: add OPT_NUMBER_CALLBACK
|
||||
parseopt: add PARSE_OPT_NODASH
|
||||
grep: remove global variable builtin_grep
|
||||
grep: use parseopt
|
||||
grep: make callback functions static
|
||||
|
||||
Robin Rosenberg (1):
|
||||
Disallow '\' in ref names
|
||||
|
||||
Stephen Boyd (1):
|
||||
bash completion: complete variable names for "git config" with options
|
||||
|
||||
Trent Piepho (1):
|
||||
send-email: Add config option for sender address
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (May 2009, #03; Sun, 31)
|
||||
X-maint-at: 6a01554e6350123c78de805d820e90f1c56e5fdc
|
||||
X-master-at: f9275c68af58e0f65e1557b5109ccbfdbbbc384a
|
||||
X-maint-was: e701fadb9e0e51a6811690d95a53bd1f5b6fad86
|
||||
X-master-was: b74d779bd90477f6514d0a9be4a75b4c40ed946c
|
||||
|
||||
What's in git.git (May 2009, #03; Sun, 31)
|
||||
|
||||
maint 6a01554 (fix segfault showing an empty remote)
|
||||
master f9275c6 (Merge branch 'sb/opt-filename')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
A rather large-ish updates on the 'master' front. The 'maint' has some
|
||||
fixes that should eventually produce 1.6.3.2.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Alex Riesen (5):
|
||||
Introduce an unlink(2) wrapper which gives warning if unlink failed
|
||||
replace direct calls to unlink(2) with unlink_or_warn
|
||||
print unlink(2) errno in copy_or_link_directory
|
||||
Clarify kind of conflict in merge-one-file helper
|
||||
http-push.c::remove_locks(): fix use after free
|
||||
|
||||
Clemens Buchacher (1):
|
||||
fix segfault showing an empty remote
|
||||
|
||||
Dave Olszewski (1):
|
||||
merge-recursive: never leave index unmerged while recursing
|
||||
|
||||
Jeff King (5):
|
||||
fix GIT_TRACE segfault with shell-quoted aliases
|
||||
add: don't complain when adding empty project root
|
||||
lock_ref: inform callers of unavailable ref
|
||||
fetch: report ref storage DF errors more accurately
|
||||
fix cat-file usage message and documentation
|
||||
|
||||
Jim Meyering (1):
|
||||
format-patch let -k override a config-specified format.numbered
|
||||
|
||||
Johannes Schindelin (1):
|
||||
Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
|
||||
|
||||
Junio C Hamano (1):
|
||||
Prepare for 1.6.3.2
|
||||
|
||||
Linus Torvalds (2):
|
||||
Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
|
||||
Teach 'git checkout' to preload the index contents
|
||||
|
||||
Michael J Gruber (1):
|
||||
merge-options.txt: Clarify merge --squash
|
||||
|
||||
Nicolas Pitre (1):
|
||||
allow OFS_DELTA objects during a push
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Benjamin Kramer (1):
|
||||
imap-send: add support for IPv6
|
||||
|
||||
Björn Steinbrink (1):
|
||||
git-apply(1): Clarify that one can select where to apply the patch
|
||||
|
||||
Brandon Casey (11):
|
||||
t3900: use ancient iconv names for backward compatibility
|
||||
Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
|
||||
builtin-mailinfo.c: compare character encodings case insensitively
|
||||
builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback
|
||||
encoding
|
||||
t3901: avoid negation on right hand side of '|'
|
||||
t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
|
||||
t9301: use ISO8859-1 rather than ISO-8859-1
|
||||
t5100: use ancient encoding syntax for backwards compatibility
|
||||
t8005: use more portable character encoding names
|
||||
t8005: convert CP1251 character set to ISO8859-5
|
||||
t8005: fix typo, it's ISO-8859-5, not KOI8-R
|
||||
|
||||
Christian Couder (3):
|
||||
bisect: rework some rev related functions to make them more reusable
|
||||
commit: add function to unparse a commit and its parents
|
||||
bisect: check ancestors without forking a "git rev-list" process
|
||||
|
||||
Clemens Buchacher (1):
|
||||
http-push: reuse existing is_null_ref
|
||||
|
||||
Eric Wong (1):
|
||||
git-svn: refuse to dcommit non-UTF-8 messages
|
||||
|
||||
Jeff King (2):
|
||||
convert bare readlink to strbuf_readlink
|
||||
git-add: no need for -f when resolving a conflict in already tracked path
|
||||
|
||||
Jim Meyering (1):
|
||||
post-receive-email: hooks.showrev: show how to include both web link and
|
||||
patch
|
||||
|
||||
Johannes Sixt (1):
|
||||
t3701: ensure correctly set up repository after skipped tests
|
||||
|
||||
Josh Micich (3):
|
||||
mktree --missing: updated usage message and man page
|
||||
mktree --batch: build more than one tree object
|
||||
mktree: validate entry type in input
|
||||
|
||||
Junio C Hamano (11):
|
||||
build-in git-mktree
|
||||
mktree: use parse-options
|
||||
builtin-mktree.c: use a helper function to handle one line of input
|
||||
mktree: do not barf on a submodule commit
|
||||
t1010: add mktree test
|
||||
mktree --missing: allow missing objects
|
||||
Revert "git-add--interactive: remove hunk coalescing"
|
||||
Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
|
||||
OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
|
||||
Update draft release notes to 1.6.4
|
||||
completion: fix PS1 display during an AM on detached HEAD
|
||||
|
||||
Matt Graham (1):
|
||||
Splitting a hunk that adds a line at the top fails in "add -p"
|
||||
|
||||
Michael Witten (6):
|
||||
Docs: send-email: Put options back into alphabetical order
|
||||
Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
|
||||
Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
send-email: 'References:' should only reference what is sent
|
||||
send-email: Remove superfluous `my $editor = ...'
|
||||
|
||||
Michal Marek (1):
|
||||
apply: handle filenames with double slashes better
|
||||
|
||||
Nguyễn Thái Ngọc Duy (1):
|
||||
t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
|
||||
|
||||
René Scharfe (1):
|
||||
grep: fix word-regexp at the beginning of lines
|
||||
|
||||
SZEDER Gábor (1):
|
||||
bash: remove always true if statement from __git_ps1()
|
||||
|
||||
Stephen Boyd (10):
|
||||
format-patch: migrate to parse-options API
|
||||
parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
|
||||
show-branch: migrate to parse-options API
|
||||
commit: -F overrides -t
|
||||
apply, fmt-merge-msg: use relative filenames
|
||||
parse-opts: prepare for OPT_FILENAME
|
||||
parse-opts: add OPT_FILENAME and transition builtins
|
||||
t5500: Modernize test style
|
||||
t9120: don't expect failure with SVN_HTTPD_PORT unset
|
||||
config.txt: document add.ignore-errors
|
||||
|
||||
Thomas Rast (1):
|
||||
Documentation: teach stash/pop workflow instead of stash/apply
|
||||
|
||||
@@ -1,207 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jun 2009, #01; Sun, 14)
|
||||
X-maint-at: 50a991ec46d57ffc4b7fbd0e8a13182dab3cd5de
|
||||
X-master-at: 4f4fa9c228a1ac2854c0814b5b23df43b8d98203
|
||||
X-maint-was: 6a01554e6350123c78de805d820e90f1c56e5fdc
|
||||
X-master-was: f9275c68af58e0f65e1557b5109ccbfdbbbc384a
|
||||
|
||||
What's in git.git (Jun 2009, #01; Sun, 14)
|
||||
|
||||
maint 50a991e (Merge branch 'maint-1.6.2' into maint)
|
||||
master 4f4fa9c (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Here is what we have as of tonight. We'd probably want 1.6.3.2 soon to
|
||||
flush these accumulated small fixes, and start making noises about -rc
|
||||
freeze for 1.6.4 soon.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Charles Bailey (2):
|
||||
t6023: merge-file fails to output anything for a degenerate merge
|
||||
Change xdl_merge to generate output even for null merges
|
||||
|
||||
Johannes Sixt (3):
|
||||
t3701: ensure correctly set up repository after skipped tests
|
||||
fetch-pack: close output channel after sideband demultiplexer terminates
|
||||
diff.c: plug a memory leak in an error path
|
||||
|
||||
Junio C Hamano (4):
|
||||
Revert "git-add--interactive: remove hunk coalescing"
|
||||
Update draft release notes for 1.6.3.2
|
||||
blame: correctly handle a path that used to be a directory
|
||||
GIT 1.6.3.2
|
||||
|
||||
Matt Graham (1):
|
||||
Splitting a hunk that adds a line at the top fails in "add -p"
|
||||
|
||||
Michael J Gruber (1):
|
||||
builtin-remote: Make "remote show" display all urls
|
||||
|
||||
Paolo Bonzini (1):
|
||||
Documentation: git-send-mail can take rev-list arg to drive format-patch
|
||||
|
||||
René Scharfe (3):
|
||||
grep: fix word-regexp at the beginning of lines
|
||||
grep: fix colouring of matches with zero length
|
||||
grep: fix empty word-regexp matches
|
||||
|
||||
Shawn O. Pearce (1):
|
||||
daemon: Strictly parse the "extra arg" part of the command
|
||||
|
||||
Stephen Boyd (3):
|
||||
commit: -F overrides -t
|
||||
apply, fmt-merge-msg: use relative filenames
|
||||
git-rerere.txt: grammatical fixups and cleanups
|
||||
|
||||
Thomas Rast (3):
|
||||
Documentation: teach stash/pop workflow instead of stash/apply
|
||||
add -i: do not dump patch during application
|
||||
Documentation: refer to gitworkflows(7) from tutorial and git(1)
|
||||
|
||||
Uwe Kleine-König (1):
|
||||
rebase--interactive: remote stray closing parenthesis
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Brandon Casey (9):
|
||||
Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
|
||||
Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile
|
||||
arguments
|
||||
On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX
|
||||
spec
|
||||
git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
|
||||
Makefile: define __sun__ on SunOS
|
||||
Makefile: add section for SunOS 5.7
|
||||
git-compat-util.h: avoid using c99 flex array feature with Sun compiler
|
||||
5.8
|
||||
git-send-email.perl: improve detection of MIME encoded-words
|
||||
send-email: use UTF-8 rather than utf-8 for consistency
|
||||
|
||||
Christian Couder (5):
|
||||
bisect: drop unparse_commit() and use clear_commit_marks()
|
||||
bisect: display first bad commit without forking a new process
|
||||
bisect: add parameters to "filter_skipped"
|
||||
bisect: when skipping, choose a commit away from a skipped commit
|
||||
t6030: test skipping away from an already skipped commit
|
||||
|
||||
Clemens Buchacher (5):
|
||||
match_refs: search ref list tail internally
|
||||
refuse to merge during a merge
|
||||
test-lib: fail if invalid options are passed
|
||||
test-lib: allow exit trap to be used for cleanup by tests
|
||||
test-lib: fix http exit codes
|
||||
|
||||
Daniel Trstenjak (1):
|
||||
Show presence of stashed changes in bash prompt.
|
||||
|
||||
David Aguilar (4):
|
||||
mergetool--lib: add support for araxis merge
|
||||
compat: add a mkstemps() compatibility function
|
||||
compat: add a basename() compatibility function
|
||||
diff: generate pretty filenames in prep_temp_blob()
|
||||
|
||||
Edward Z. Yang (1):
|
||||
connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
|
||||
|
||||
Johan Herland (1):
|
||||
Rename submodule.<name>.rebase to submodule.<name>.update
|
||||
|
||||
Johannes Schindelin (6):
|
||||
MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
|
||||
Quiet make: do not leave Windows behind
|
||||
Work around a regression in Windows 7, causing erase_in_line() to crash
|
||||
sometimes
|
||||
test-chmtime: work around Windows limitation
|
||||
MinGW: fix warning about implicit declaration of _getch()
|
||||
Fix warnings in nedmalloc when compiling with GCC 4.4.0
|
||||
|
||||
Johannes Sixt (4):
|
||||
Simplify some instances of run_command() by using run_command_v_opt().
|
||||
Simplify some 'fprintf(stderr); return -1;' by using 'return error()'
|
||||
Fix typo in nedmalloc warning fix
|
||||
compat/ has subdirectories: do not omit them in 'make clean'
|
||||
|
||||
Junio C Hamano (4):
|
||||
Documentation/git.txt: update links to release notes
|
||||
Makefile: introduce SANE_TOOL_PATH for prepending required elements to
|
||||
PATH
|
||||
Makefile: test-parse-options depends on parse-options.h
|
||||
Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
|
||||
|
||||
Kjetil Barvik (1):
|
||||
symlinks.c: small style cleanup
|
||||
|
||||
Linus Torvalds (1):
|
||||
Clean up and simplify rev_compare_tree()
|
||||
|
||||
Marius Storm-Olsen (2):
|
||||
MinGW readdir reimplementation to support d_type
|
||||
Add custom memory allocator to MinGW and MacOS builds
|
||||
|
||||
Markus Heidelberg (6):
|
||||
add a test for git-send-email for non-threaded mails
|
||||
send-email: fix non-threaded mails
|
||||
doc/send-email: clarify the behavior of --in-reply-to with --no-thread
|
||||
add a test for git-send-email for threaded mails without chain-reply-to
|
||||
send-email: fix threaded mails without chain-reply-to
|
||||
send-email: fix a typo in a comment
|
||||
|
||||
Michael J Gruber (1):
|
||||
git-repack.txt: Clarify implications of -a for dumb protocols
|
||||
|
||||
Mike Hommey (7):
|
||||
Don't expect verify_pack() callers to set pack_size
|
||||
transport.c::get_refs_via_curl(): do not leak refs_url
|
||||
http.c: new functions for the http API
|
||||
transport.c::get_refs_via_curl(): use the new http API
|
||||
http.c::http_fetch_ref(): use the new http API
|
||||
http-push.c::remote_exists(): use the new http API
|
||||
http-push.c::fetch_symref(): use the new http API
|
||||
|
||||
Nick Woolley (1):
|
||||
git-cvsexportcommit can't commit files which have been removed from CVS
|
||||
|
||||
Pat Thoyts (1):
|
||||
git: browsing paths with spaces when using the start command
|
||||
|
||||
Peter Hutterer (1):
|
||||
git-submodule: add support for --rebase.
|
||||
|
||||
Pierre Habouzit (1):
|
||||
parse-options: add parse_options_check to validate option specs.
|
||||
|
||||
Ralf Wildenhues (1):
|
||||
configure: test whether -lresolv is needed
|
||||
|
||||
SZEDER Gábor (2):
|
||||
Documentation: mention 'git stash pop --index' option explicitly
|
||||
bash: add support for 'git stash pop --index' option
|
||||
|
||||
Steffen Prohaska (1):
|
||||
MinGW: Teach Makefile to detect msysgit and apply specific settings
|
||||
|
||||
Stephen Boyd (2):
|
||||
git-show-branch.txt: document --date-order option
|
||||
show-branch: don't use LASTARG_DEFAULT with OPTARG
|
||||
|
||||
Tay Ray Chuan (16):
|
||||
http*: cleanup slot->local after fclose
|
||||
t5540-http-push: test fetching of loose objects
|
||||
t5540-http-push: test fetching of packed objects
|
||||
http-push: send out fetch requests on queue
|
||||
http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"
|
||||
t5550-http-fetch: test fetching of packed objects
|
||||
http-push, http-walker: style fixes
|
||||
http-walker: verify remote packs
|
||||
http*: copy string returned by sha1_to_hex
|
||||
http-push: do not SEGV after fetching a bad pack idx file
|
||||
http*: move common variables and macros to http.[ch]
|
||||
http: create function end_url_with_slash
|
||||
http*: add http_get_info_packs
|
||||
http: use new http API in fetch_index()
|
||||
http*: add helper methods for fetching packs
|
||||
http*: add helper methods for fetching objects (loose)
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jun 2009, #02; Mon, 22)
|
||||
X-maint-at: 1ab012cf811abba5745fa0da70db963decd65f21
|
||||
X-master-at: 916e1373fb86db9d7019de4e7e74e39c9474a153
|
||||
X-maint-was: cff4231a1dfbe68b4a163b31406d862567d3243a
|
||||
X-master-was: 4f4fa9c228a1ac2854c0814b5b23df43b8d98203
|
||||
|
||||
What's in git.git (Jun 2009, #02; Mon, 22)
|
||||
|
||||
maint 1ab012c (t3700-add: add a POSIXPERM prerequisite to a new test)
|
||||
master 916e137 (Merge branch 'maint')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
The 'maint' branch gave birth to v1.6.3.3 tonight. There are still
|
||||
a handful of fixes that are already in 'master' but have not been
|
||||
backmerged for v1.6.3.X series; hopefully we can flush them all and make
|
||||
v1.6.3.4 the final one before 'master' starts the rc freeze for v1.6.4.
|
||||
|
||||
* The 'maint' branch has these fixes since v1.6.3.3.
|
||||
|
||||
Johannes Sixt (1):
|
||||
t3700-add: add a POSIXPERM prerequisite to a new test
|
||||
|
||||
Stephen Boyd (1):
|
||||
add: allow configurations to be overriden by command line
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alex Bennée (1):
|
||||
Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS
|
||||
working tree before applying commit patch
|
||||
|
||||
Christian Stimming (1):
|
||||
gitk: Update German translation.
|
||||
|
||||
Dirk Süsserott (1):
|
||||
gitk: Add option 'Simple history' to the options menu
|
||||
|
||||
Elijah Newren (1):
|
||||
gitk: Make more options easily accessible from Edit View dialog
|
||||
|
||||
Jim Meyering (1):
|
||||
avoid NULL dereference on failed malloc
|
||||
|
||||
Johan Herland (1):
|
||||
git-submodule: add support for --merge.
|
||||
|
||||
Johannes Sixt (1):
|
||||
gitk: Use --textconv to generate diff text
|
||||
|
||||
Junio C Hamano (5):
|
||||
write-tree --ignore-cache-tree
|
||||
cache-tree.c::cache_tree_find(): simplify internal API
|
||||
t4007: modernize the style
|
||||
Optimize "diff-index --cached" using cache-tree
|
||||
Avoid "diff-index --cached" optimization under --find-copies-harder
|
||||
|
||||
Linus Torvalds (1):
|
||||
Fix various sparse warnings in the git source code
|
||||
|
||||
Markus Heidelberg (1):
|
||||
gitk: Allow diff view without context lines
|
||||
|
||||
Michael J Gruber (5):
|
||||
Allow push and fetch urls to be different
|
||||
t5516: Check pushurl config setting
|
||||
technical/api-remote: Describe new struct remote member pushurl
|
||||
builtin-remote: Show push urls as well
|
||||
builtin-remote: Make "remote -v" display push urls
|
||||
|
||||
Michele Ballabio (1):
|
||||
gitk: Add another string to translation
|
||||
|
||||
Paolo Bonzini (1):
|
||||
Test cccmd in t9001-send-email.sh and fix some bugs
|
||||
|
||||
Pat Thoyts (1):
|
||||
gitk: Handle msysGit version during version comparisons
|
||||
|
||||
Paul Mackerras (1):
|
||||
gitk: Check git version before using --textconv flag
|
||||
|
||||
Santi Béjar (3):
|
||||
parse-remote: function to get the tracking branch to be merge
|
||||
parse-remote: support default reflist in get_remote_merge_branch
|
||||
parse-remote: remove unused functions
|
||||
|
||||
Stephen Boyd (2):
|
||||
parse-options: make OPT_INTEGER's argh explicit
|
||||
parse-options: simplify usage argh handling
|
||||
|
||||
@@ -1,295 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jul 2009, #01; Sun, 26)
|
||||
X-maint-at: 54bc13ce5300bf7c2237aba3fd123dd587e56d31
|
||||
X-master-at: d8f7be2ebcb7e3ec40269080a9ab9a28bc06ba17
|
||||
X-maint-was: 1ab012cf811abba5745fa0da70db963decd65f21
|
||||
X-master-was: 916e1373fb86db9d7019de4e7e74e39c9474a153
|
||||
|
||||
What's in git.git (Jul 2009, #01; Sun, 26)
|
||||
|
||||
maint 54bc13c (t8005: Nobody writes Russian in shift_jis)
|
||||
master d8f7be2 (GIT 1.6.4-rc3)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
The tip of 'master' is 1.6.4-rc3 and it should be the last -rc before the
|
||||
1.6.4 final.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Brandon Casey (2):
|
||||
refs.c: release file descriptor on error return
|
||||
sha1_name.c: avoid unnecessary strbuf_release
|
||||
|
||||
Chris Frey (1):
|
||||
git-remote: fix missing .uploadpack usage for show command
|
||||
|
||||
Clemens Buchacher (1):
|
||||
fetch: do not create ref from empty name
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
gitweb/README: fix AliasMatch in example
|
||||
|
||||
Johannes Sixt (1):
|
||||
Makefile: git.o depends on library headers
|
||||
|
||||
Junio C Hamano (8):
|
||||
request-pull: really disable pager
|
||||
checkout -f: deal with a D/F conflict entry correctly
|
||||
combine-diff.c: fix performance problem when folding common deleted lines
|
||||
diff --cc: a lost line at the beginning of the file is shown incorrectly
|
||||
do_one_ref(): null_sha1 check is not about broken ref
|
||||
SunOS grep does not understand -C<n> nor -e
|
||||
Fix severe breakage in "git-apply --whitespace=fix"
|
||||
t8005: Nobody writes Russian in shift_jis
|
||||
|
||||
Linus Torvalds (3):
|
||||
git branch: fix performance problem
|
||||
git branch: avoid unnecessary object lookups
|
||||
git branch: clean up detached branch handling
|
||||
|
||||
Matthias Andree (1):
|
||||
Fix export_marks() error handling.
|
||||
|
||||
Michal Marek (1):
|
||||
request-pull: really really disable pager
|
||||
|
||||
Miklos Vajna (1):
|
||||
git-submodule documentation: fix foreach example
|
||||
|
||||
René Scharfe (1):
|
||||
attr: plug minor memory leak
|
||||
|
||||
Roel Kluin (1):
|
||||
fread does not return negative on error
|
||||
|
||||
SZEDER Gábor (1):
|
||||
Trailing whitespace and no newline fix
|
||||
|
||||
Sitaram Chamarty (1):
|
||||
Documentation: update description of shell aliases
|
||||
|
||||
Thadeu Lima de Souza Cascardo (1):
|
||||
Makes some cleanup/review in gittutorial
|
||||
|
||||
Thomas Rast (2):
|
||||
Test git archive --remote
|
||||
Test grep --and/--or/--not
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
Alex Vandiver (2):
|
||||
Make section_name_match start on '[', and return the length on success
|
||||
After renaming a section, print any trailing variable definitions
|
||||
|
||||
Andreas Ericsson (1):
|
||||
mailinfo: Remove only one set of square brackets
|
||||
|
||||
Ben Jackson (3):
|
||||
Add 'git svn help [cmd]' which works outside a repo.
|
||||
git-svn: speed up find_rev_before
|
||||
Add 'git svn reset' to unwind 'git svn fetch'
|
||||
|
||||
Bert Wesarg (1):
|
||||
builtin-remote: (get_one_entry): use strbuf
|
||||
|
||||
Björn Steinbrink (1):
|
||||
Add a test showing that 'git repack' throws away grafted-away parents
|
||||
|
||||
Brandon Casey (10):
|
||||
Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
|
||||
t/t9001-send-email.sh: ensure generated script is executed with
|
||||
$SHELL_PATH
|
||||
git.c: avoid allocating one-too-many elements for new argv array
|
||||
unpack-trees.c: work around run-time array initialization flaw on IRIX
|
||||
6.5
|
||||
git-compat-util.h: adjust for SGI IRIX 6.5
|
||||
Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments
|
||||
Makefile: add section for SGI IRIX 6.5
|
||||
Makefile: update IRIX64 section
|
||||
configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
|
||||
configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is
|
||||
missing
|
||||
|
||||
Christian Couder (2):
|
||||
bisect: use a PRNG with a bias when skipping away from untestable commits
|
||||
Documentation: remove warning saying that "git bisect skip" may slow
|
||||
bisection
|
||||
|
||||
Daniel Trstenjak (1):
|
||||
Show the presence of untracked files in the bash prompt.
|
||||
|
||||
Eric Wong (12):
|
||||
git-svn: convert globs to regexps for branch destinations
|
||||
t9138: remove stray dot in test which broke bash
|
||||
Allow the Unix epoch to be a valid commit date
|
||||
git svn: allow uppercase UUIDs from SVN
|
||||
git svn: rename tests that had conflicting numbers
|
||||
git svn: fix reparenting when ugly http(s) URLs are used
|
||||
git svn: fix shallow clone when upstream revision is too new
|
||||
git svn: revert default behavior for --minimize-url
|
||||
git svn: the branch command no longer needs the full path
|
||||
t9142: stop httpd after the test
|
||||
git svn: avoid escaping '/' when renaming/copying files
|
||||
git svn: make minimize URL more reliable over http(s)
|
||||
|
||||
Giuseppe Bilotta (11):
|
||||
git-am foreign patch support: introduce patch_format
|
||||
git-am foreign patch support: autodetect some patch formats
|
||||
git-am foreign patch support: StGIT support
|
||||
git-am: refactor 'cleaning up and aborting'
|
||||
gitweb: refactor author name insertion
|
||||
gitweb: uniform author info for commit and commitdiff
|
||||
gitweb: use git_print_authorship_rows in 'tag' view too
|
||||
gitweb: (gr)avatar support
|
||||
gitweb: gravatar url cache
|
||||
gitweb: picon avatar provider
|
||||
gitweb: add empty alt text to avatar img
|
||||
|
||||
Hunter, D. Seth (1):
|
||||
http-push: fix xml_entities() string parsing overrun
|
||||
|
||||
Jeff King (5):
|
||||
Makefile: refactor regex compat support
|
||||
Makefile: use compat regex on Solaris
|
||||
log-tree: fix confusing comment
|
||||
Makefile: install 'git' in execdir
|
||||
send-email: detect cycles in alias expansion
|
||||
|
||||
Johan Herland (1):
|
||||
quickfetch(): Prevent overflow of the rev-list command line
|
||||
|
||||
Johannes Schindelin (1):
|
||||
git repack: keep commits hidden by a graft
|
||||
|
||||
Johannes Sixt (5):
|
||||
daemon: send stderr of service programs to the syslog
|
||||
upload-pack: squelch progress indicator if client cannot see it
|
||||
receive-pack: do not send error details to the client
|
||||
git-mv: fix directory separator treatment on Windows
|
||||
MinGW: truncate exit()'s argument to lowest 8 bits
|
||||
|
||||
Junio C Hamano (7):
|
||||
die_errno(): double % in strerror() output just in case
|
||||
Makefile: keep "git" when bindir is execdir
|
||||
Revert "mailinfo: Remove only one set of square brackets"
|
||||
push: do not give big warning when no preference is configured
|
||||
Updates to draft release notes to 1.6.4
|
||||
Update release notes for 1.6.4
|
||||
GIT 1.6.4-rc3
|
||||
|
||||
Larry D'Anna (1):
|
||||
add --porcelain option to git-push
|
||||
|
||||
Linus Torvalds (11):
|
||||
git log: add '--merges' flag to match '--no-merges'
|
||||
Add 'fill_directory()' helper function for directory traversal
|
||||
Simplify read_directory[_recursive]() arguments
|
||||
Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache
|
||||
entry
|
||||
Avoid using 'lstat()' to figure out directories
|
||||
Prepare symlink caching for thread-safety
|
||||
Export thread-safe version of 'has_symlink_leading_path()'
|
||||
Make index preloading check the whole path to the file
|
||||
Make 'git show' more useful
|
||||
Improve on the 'invalid object' error message at commit time
|
||||
Fix extraneous lstat's in 'git checkout -f'
|
||||
|
||||
Marc Branchaud (3):
|
||||
git svn: Support multiple branch and tag paths in the svn repository.
|
||||
git svn: cleanup t9138-multiple-branches
|
||||
git svn: Doc update for multiple branch and tag paths
|
||||
|
||||
Mark Lodato (2):
|
||||
http.c: prompt for SSL client certificate password
|
||||
http.c: add http.sslCertPasswordProtected option
|
||||
|
||||
Martin Koegler (1):
|
||||
git stash: modernize use of "dashed" git-XXX calls
|
||||
|
||||
Martin Renold (1):
|
||||
Remove filename from conflict markers
|
||||
|
||||
Mattias Nissler (2):
|
||||
git-svn: Always duplicate paths returned from get_log
|
||||
git-svn: Fix branch detection when repository root is inaccessible
|
||||
|
||||
Michael J Gruber (1):
|
||||
t4202-log.sh: Test git log --no-walk sort order
|
||||
|
||||
Mike Ralphson (1):
|
||||
cvsexportcommit: reorder tests to quiet intermittent failure
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
Documentation/config.txt: a variable can be defined on the section header
|
||||
line
|
||||
|
||||
Nick Edelen (1):
|
||||
diff-tree -r -t: include added/removed directories in the output
|
||||
|
||||
Nick Woolley (2):
|
||||
Remove archaic use of regex capture \1 in favour of $1
|
||||
Avoid generating a warning if $fullname{$file} is undefined
|
||||
|
||||
Pierre Habouzit (4):
|
||||
janitor: use NULL and not 0 for pointers.
|
||||
refactor: use bitsizeof() instead of 8 * sizeof()
|
||||
janitor: add DIV_ROUND_UP and use it.
|
||||
janitor: useless checks before free
|
||||
|
||||
René Scharfe (7):
|
||||
userdiff: add xdiff_clear_find_func()
|
||||
grep: move context hunk mark handling into show_line()
|
||||
grep: print context hunk marks between files
|
||||
grep: handle pre context lines on demand
|
||||
grep: add option -p/--show-function
|
||||
grep -p: support user defined regular expressions
|
||||
grep: simplify -p output
|
||||
|
||||
Robert Allan Zeh (1):
|
||||
git svn: add gc command
|
||||
|
||||
SZEDER Gábor (2):
|
||||
Document 'git (rev-list|log) --merges'
|
||||
bash: add '--merges' to common 'git log' options
|
||||
|
||||
Stephen Boyd (9):
|
||||
t4150: test applying with a newline in subject
|
||||
am: suppress apply errors when using 3-way
|
||||
git-sh-setup: introduce say() for quiet options
|
||||
submodule, repack: migrate to git-sh-setup's say()
|
||||
am, rebase: teach quiet option
|
||||
stash: teach quiet option
|
||||
show-ref: migrate to parse-options
|
||||
completion: add missing config variables
|
||||
completion: __git_config_get_set_variables() handle values with spaces
|
||||
|
||||
Thomas Rast (5):
|
||||
git-svn: let 'dcommit $rev' work on $rev instead of HEAD
|
||||
Introduce die_errno() that appends strerror(errno) to die()
|
||||
Convert existing die(..., strerror(errno)) to die_errno()
|
||||
Use die_errno() instead of die() when checking syscalls
|
||||
Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
|
||||
|
||||
Todd Zullinger (1):
|
||||
completion: Add --full-diff to log options
|
||||
|
||||
Ulrich Dangel (1):
|
||||
git-svn: Canonicalize svn urls to prevent libsvn assertion
|
||||
|
||||
Uwe Kleine-König (2):
|
||||
more tests for git rev-parse --parse-opt
|
||||
parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse
|
||||
|
||||
Wincent Colaiuta (1):
|
||||
gitweb: update Git homepage URL
|
||||
|
||||
Yann Dirson (6):
|
||||
git-svn.txt: stop using dash-form of commands.
|
||||
git-svn.txt: make formatting more consistent.
|
||||
git-svn.txt: fix fetch flags incorrectly documented as init flags.
|
||||
git-svn.txt: fix description of fetch flags accepted by clone.
|
||||
List send-email config options in config.txt.
|
||||
Improve doc for format-patch threading options.
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Jul 2009, #02; Wed, 29)
|
||||
X-maint-at: 0a53e9ddeaddad63ad106860237bbf53411d11a7
|
||||
X-master-at: e6580020057afd207b7cfb9c96905f99e13cfe4d
|
||||
X-maint-was: 0a53e9ddeaddad63ad106860237bbf53411d11a7
|
||||
X-master-was: 0a53e9ddeaddad63ad106860237bbf53411d11a7
|
||||
|
||||
What's in git.git (Jul 2009, #02; Wed, 29)
|
||||
|
||||
maint 0a53e9d (GIT 1.6.4)
|
||||
master e658002 (Translate the tutorial to Brazillian Portuguese)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
I took advices from the list and merged tests that have been parked in
|
||||
'pu' during the 1.6.4 cycle to 'master'. Even though I did not see much
|
||||
feedback to the pt_BR translation of the tutorial, I decided to merge it
|
||||
as well, since I do not read/speak the language.
|
||||
|
||||
We have reasonably solid topics that have been cooking in 'next' for quite
|
||||
some time. Hopefully the 1.6.5 cycle will be short and smooth.
|
||||
|
||||
* The 'master' branch has these since the last announcement.
|
||||
|
||||
Alex Riesen (1):
|
||||
Add a reminder test case for a merge with F/D transition
|
||||
|
||||
Heiko Voigt (2):
|
||||
cvsimport: add test illustrating a bug in cvsps
|
||||
cvsimport: extend testcase about patchset order to contain branches
|
||||
|
||||
Junio C Hamano (3):
|
||||
t/t9600: remove exit after test_done
|
||||
Start 1.6.5 cycle
|
||||
request-pull: optionally show a patch as well
|
||||
|
||||
Michael Haggerty (5):
|
||||
Start a library for cvsimport-related tests
|
||||
Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
Test contents of entire cvsimported "master" tree contents
|
||||
Add some tests of git-cvsimport's handling of vendor branches
|
||||
Add a test of "git cvsimport"'s handling of tags and branches
|
||||
|
||||
Thadeu Lima de Souza Cascardo (1):
|
||||
Translate the tutorial to Brazillian Portuguese
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Aug 2009, #01; Wed, 05)
|
||||
X-maint-at: f0df1293acdba9513cae17e2c63b4169f1347371
|
||||
X-master-at: 3f55e4107f7906134df029f9a5c44864f9258110
|
||||
X-maint-was: 0a53e9ddeaddad63ad106860237bbf53411d11a7
|
||||
X-master-was: e6580020057afd207b7cfb9c96905f99e13cfe4d
|
||||
|
||||
What's in git.git (Aug 2009, #01; Wed, 05)
|
||||
|
||||
maint f0df129 (Merge branch 'maint-1.6.3' into maint)
|
||||
master 3f55e41 (Merge branch 'sb/read-tree')
|
||||
------------------------------------------------------------------------
|
||||
|
||||
The 1.6.4 release seems to have been quite solid, and there is no
|
||||
brown-paper-bag bugfixes on 'maint' yet ;-).
|
||||
|
||||
A handful of topics have graduated to 'master'.
|
||||
|
||||
* The 'maint' branch has these fixes since the last announcement.
|
||||
|
||||
Björn Steinbrink (1):
|
||||
config: Keep inner whitespace verbatim
|
||||
|
||||
Erik Faye-Lund (1):
|
||||
send-email: remove debug trace
|
||||
|
||||
Jakub Narebski (1):
|
||||
gitweb/README: Document $base_url
|
||||
|
||||
Jens Lehmann (1):
|
||||
Documentation: git submodule: add missing options to synopsis
|
||||
|
||||
Matthieu Moy (1):
|
||||
Better usage string for reflog.
|
||||
|
||||
Miklos Vajna (1):
|
||||
hg-to-git: don't import the unused popen2 module
|
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to the above.
|
||||
|
||||
André Goddard Rosa (1):
|
||||
Fix typos on pt_BR/gittutorial.txt translation
|
||||
|
||||
Geoffrey Irving (1):
|
||||
git fast-export: add --no-data option
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
gitweb: fix 'Use of uninitialized value' error in href()
|
||||
|
||||
Jeff King (2):
|
||||
show: suppress extra newline when showing annotated tag
|
||||
show: add space between multiple items
|
||||
|
||||
Johannes Schindelin (1):
|
||||
parse-opt: optionally show "--no-" option string
|
||||
|
||||
Junio C Hamano (1):
|
||||
apply: notice creation/removal patches produced by GNU diff
|
||||
|
||||
Michael J Gruber (3):
|
||||
t6010-merge-base.sh: Depict the octopus test graph
|
||||
git-merge-base/git-show-branch: Cleanup documentation and usage
|
||||
git-merge-base/git-show-branch --merge-base: Documentation and test
|
||||
|
||||
Michał Kiedrowicz (1):
|
||||
init-db: migrate to parse-options
|
||||
|
||||
Nanako Shiraishi (1):
|
||||
git init: optionally allow a directory argument
|
||||
|
||||
Nick Edelen (1):
|
||||
Shift object enumeration out of upload-pack
|
||||
|
||||
Santi Béjar (2):
|
||||
t5520-pull: Test for rebased upstream + fetch + pull --rebase
|
||||
pull: support rebased upstream + fetch + pull --rebase
|
||||
|
||||
Stephen Boyd (7):
|
||||
read-tree: convert unhelpful usage()'s to helpful die()'s
|
||||
read-tree: migrate to parse-options
|
||||
write-tree: migrate to parse-options
|
||||
verify-tag: migrate to parse-options
|
||||
verify-pack: migrate to parse-options
|
||||
prune-packed: migrate to parse-options
|
||||
technical-docs: document tree-walking API
|
||||
|
||||
Wesley J. Landaker (2):
|
||||
Documentation: git-send-email: fix submission port number
|
||||
Documentation: git-send-email: correct statement about standard ports
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's in git.git (Feb 2010, #01; Mon, 08)
|
||||
X-maint-at: e33cc592deae8132936eea119554799e1039bc0f
|
||||
X-master-at: 8b2337a5893479ee18dfb21a1d4aa5fc1608872d
|
||||
X-maint-was: 9504f3d3d2e62cb6fba9e7c61c6fe69dec9053a4
|
||||
X-master-was: 8051a030617cf7d083568cca223bdaa15052c33f
|
||||
|
||||
What's in git.git (Feb 2010, #01; Mon, 08)
|
||||
|
||||
maint e33cc59 (Merge branch 'maint-1.6.5' into maint)
|
||||
master 8b2337a (t3902: Protect against OS X normalization)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Not much is going on in 'next' and 'pu'.
|
||||
|
||||
* The 'master' branch has these since v1.7.0-rc2 in addition to what are
|
||||
in 'maint'.
|
||||
|
||||
Brian Gernhardt (1):
|
||||
t3902: Protect against OS X normalization
|
||||
|
||||
Nicolas Pitre (1):
|
||||
Revert "pack-objects: fix pack generation when using pack_size_limit"
|
||||
|
||||
* The 'maint' branch has these fixes since v1.6.6.1; they are mostly minor
|
||||
documentation fixes. I might be issuing v1.6.6.2 before v1.7.0 final.
|
||||
|
||||
Christopher Beelby (1):
|
||||
git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
|
||||
|
||||
Giuseppe Bilotta (1):
|
||||
git-gui: work from the .git dir
|
||||
|
||||
Jay Soffian (1):
|
||||
blame: prevent a segv when -L given start > EOF
|
||||
|
||||
Jeff Epler (1):
|
||||
git-gui: Fix applying a line when all following lines are deletions
|
||||
|
||||
Jeff King (1):
|
||||
fix memcpy of overlapping area
|
||||
|
||||
Jens Lehmann (1):
|
||||
git-gui: Correct file_states when unstaging partly staged entry
|
||||
|
||||
Jonathan Nieder (1):
|
||||
git-gui: Makefile: consolidate .FORCE-* targets
|
||||
|
||||
Junio C Hamano (8):
|
||||
status: don't require the repository to be writable
|
||||
Fix "log" family not to be too agressive about showing notes
|
||||
Fix "log --oneline" not to show notes
|
||||
merge-recursive: do not return NULL only to cause segfault
|
||||
ignore duplicated slashes in make_relative_path()
|
||||
git-add documentation: Fix shell quoting example
|
||||
Fix parsing of imap.preformattedHTML and imap.sslverify
|
||||
git-push: document all the status flags used in the output
|
||||
|
||||
Pat Thoyts (1):
|
||||
git-gui: handle really long error messages in updateindex.
|
||||
|
||||
Peter Krefting (1):
|
||||
git-gui: Fix gitk for branch whose name matches local file
|
||||
|
||||
René Scharfe (1):
|
||||
archive: simplify archive format guessing
|
||||
|
||||
SZEDER Gábor (1):
|
||||
bash: don't offer remote transport helpers as subcommands
|
||||
|
||||
Tay Ray Chuan (1):
|
||||
retry request without query when info/refs?query fails
|
||||
|
||||
Vitaly _Vi Shukela (1):
|
||||
git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
|
||||
|
||||
Wesley J. Landaker (1):
|
||||
Update git fsck --full short description to mention packs
|
||||
Reference in New Issue
Block a user