* The 'maint' branch is now for post 1.4.3 fixes. It currently
contains these:
Nguyễn Thái Ngọc Duy (2):
Reject hexstring longer than 40-bytes in get_short_sha1()
Add revspec documentation for ':path', ':[0-3]:path' and git-describe
Nicolas Pitre (1):
reduce delta head inflated size
* The 'master' branch has produced 1.4.3 release today. I've
merged the 'maint' fixes and the first wave of what have been
cooking in "next".
Andy Whitcroft (1):
add proper dependancies on the xdiff source
Johannes Schindelin (1):
Turn on recursive with --summary
Junio C Hamano (7):
grep --all-match
teach revision walker about --all-match.
git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)
git-send-email: do not drop custom headers the user prepared
git-send-email: real name with period need to be dq-quoted on From: line
Make git-send-email detect mbox-style patches more readily
diff --numstat
Markus Amsler (1):
git-imap-send: Strip smtp From_ header from imap message.
Martin Waitz (2):
gitweb: start to generate PATH_INFO URLs.
gitweb: warn if feature cannot be overridden.
Matthew Wilcox (1):
Add --dry-run option to git-send-email
Nguyễn Thái Ngọc Duy (2):
Reject hexstring longer than 40-bytes in get_short_sha1()
Add revspec documentation for ':path', ':[0-3]:path' and git-describe
Nicolas Pitre (1):
reduce delta head inflated size
Petr Baudis (3):
gitweb: Document features better
gitweb: Fix search form when PATH_INFO is enabled
bisect reset: Leave the tree in usable state if git-checkout failed
Rene Scharfe (2):
git-archive --format=zip: use default version ID
git-archive --format=zip: add symlink support
Robert Shearman (2):
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
Santi Béjar (2):
merge and resolve: Output short hashes and .. in "Updating ..."
fetch: Misc output cleanup
Sasha Khapyorsky (1):
git-svnimport.perl: copying directory from original SVN place
* The 'next' branch, in addition, has these. Roughly speaking,
there are two and half big topics:
(1) Nico's delta-base-offset encoding;
(2) Linus's packed-refs and related changes;
(3) my blame --porcelain and its use in gitweb;
When the dust settles after the first wave I pushed out
tonight, I'd merge delta-base-offset stuff as the second wave,
and then hopefully packed-refs stuff after that. I suspect
there still remains breakage around ref-log I need to fix in
the latter topic.
Alan Chandler (1):
Gitweb - provide site headers and footers
Andy Whitcroft (2):
cvsimport: move over to using git-for-each-ref to read refs.
git-for-each-ref: improve the documentation on scripting modes
Christian Couder (12):
Add [-s|--hash] option to Linus' show-ref.
Use Linus' show ref in "git-branch.sh".
Document git-show-ref [-s|--hash] option.
Fix show-ref usage for --dereference.
Add pack-refs and show-ref test cases.
When creating branch c/d check that branch c does not already exists.
Uncomment test case: git branch c/d should barf if branch c exists.
Fix a remove_empty_dir_recursive problem.
Clean up "git-branch.sh" and add remove recursive dir test cases.
Use git-update-ref to delete a tag instead of rm()ing the ref file.
Check that a tag exists using show-ref instead of looking for the ref file.
Do not create tag leading directories since git update-ref does it.
Dennis Stosberg (2):
lock_ref_sha1_basic does not remove empty directories on BSD
Remove bashism from t3210-pack-refs.sh
Jeff King (3):
wt-status: use simplified resolve_ref to find current branch
gitignore: git-pack-refs is a generated file.
gitignore: git-show-ref is a generated file.
Johannes Schindelin (2):
Fix git-update-index --again
show-branch: mark active branch with a '*' again
Jonas Fonseca (1):
Add man page for git-show-ref
Junio C Hamano (48):
upload-pack: stop the other side when they have more roots than we do.
Add git-for-each-ref: helper for language bindings
Fix t1400-update-ref test minimally
fsck-objects: adjust to resolve_ref() clean-up.
symbolit-ref: fix resolve_ref conversion.
Add callback data to for_each_ref() family.
Tell between packed, unpacked and symbolic refs.
pack-refs: do not pack symbolic refs.
git-pack-refs --prune
pack-refs: fix git_path() usage.
lock_ref_sha1_basic: remove unused parameter "plen".
Clean-up lock-ref implementation
update-ref: -d flag and ref creation safety.
update a few Porcelain-ish for ref lock safety.
Teach receive-pack about ref-log
receive-pack: call setup_ident before git_config
ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore.
refs: minor restructuring of cached refs data.
lock_ref_sha1(): do not sometimes error() and sometimes die().
lock_ref_sha1(): check D/F conflict with packed ref when creating.
delete_ref(): delete packed ref
git-branch: remove D/F check done by hand.
show-ref --hash=len, --abbrev=len, and --abbrev
git-fetch: adjust to packed-refs.
Fix refs.c;:repack_without_ref() clean-up path
gitweb: make leftmost column of blame less cluttered.
git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.
pack-refs: use lockfile as everybody else does.
gitweb: prepare for repositories with packed refs.
Revert 954a6183756a073723a7c9fd8d2feb13132876b0
pack-refs: call fflush before fsync.
blame.c: whitespace and formatting clean-up.
git-blame: --show-number (and -n)
git-blame: --show-name (and -f)
blame.c: move code to output metainfo into a separate function.
ref-log: allow ref@{count} syntax.
git-blame --porcelain
gitweb: use blame --porcelain
core.logallrefupdates create new log file only for branch heads.
git-pack-refs --all
core.logallrefupdates thinko-fix
pack-objects: document --delta-base-offset option
blame: Document and add help text for -f, -n, and -p
gitweb: spell "blame --porcelain" with -p
git-repack: repo.usedeltabaseoffset
pack-objects: use of version 3 delta is now optional.
gitweb: use for-each-ref to show the latest activity across branches
Revert "pack-objects: use of version 3 delta is now optional."
Linus Torvalds (6):
Add "git show-ref" builtin command
Teach "git checkout" to use git-show-ref
Start handling references internally as a sorted in-memory list
Add support for negative refs
Make ref resolution saner
Enable the packed refs file format
Luben Tuikov (4):
gitweb: blame: print commit-8 on the leading row of a commit-block
gitweb: blame: Mouse-over commit-8 shows author and date
gitweb: blame porcelain: lineno and orig lineno swapped
git-revert with conflicts to behave as git-merge with conflicts
Nicolas Pitre (9):
introduce delta objects with offset to base
teach git-unpack-objects about deltas with offset to base
teach git-index-pack about deltas with offset to base
make git-pack-objects able to create deltas with offset to base
make pack data reuse compatible with both delta types
let the GIT native protocol use offsets to delta base when possible
zap a debug remnant
allow delta data reuse even if base object is a preferred base
index-pack: compare only the first 20-bytes of the key.
Petr Baudis (2):
Fix broken sha1 locking
Fix buggy ref recording
Ryan Anderson (1):
Remove git-annotate.perl and create a builtin-alias for git-blame
* The 'pu' branch, in addition, has these.
Junio C Hamano (18):
git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
para-walk: walk n trees, index and working tree in parallel
para walk wip
merge: loosen overcautious "working file will be lost" check.
git-pickaxe: blame rewritten.
git-pickaxe: minimally use revision machinery.
git-pickaxe: fix output for more than one paths from the same commit.
git-pickaxe: fix "bottom" commit handling.
git-pickaxe: allow using non -u0 diff internally.
git-pickaxe: use linked list of blame entries.
git-pickaxe: collapse trivial blame entry.
git-pickaxe: blame line movements within a file.
git-pickaxe: blame cut-and-pasted lines.
git-pickaxe: -M, -C, and -C -C
git-pickaxe: optimize nth_line()
git-pickaxe: make -C (copy from other file) take immediate blame.
git-pickaxe: document -M, -C, and -C -C
git-pickaxe: "--not A B -- path" is the same as "HEAD --not A B -- path"
Petr Baudis (1):
gitweb: Show project README if available
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html