624d3519c9
Update draft release notes to 1.7.10
...
Again this round mostly consists of fixes for 1.7.9 in preparation for
merging these topics down to maint for 1.7.9.1
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-12 22:58:36 -08:00
b6b3b6a01f
Update draft release notes to 1.7.10
...
Document bunch of bugfix topics to be merged down to 'maint' soonish
for 1.7.9.1 maintenance release.
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-10 14:16:32 -08:00
1e9d3e3663
Sync with maint
2012-02-10 14:07:00 -08:00
bf5cf766af
Update draft release notes to 1.7.9.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-10 14:04:20 -08:00
12766861cd
Update draft release notes to 1.7.10
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-07 13:01:56 -08:00
65da088244
Sync with maint
2012-02-06 00:04:47 -08:00
2d1abfa8ee
Prepare for 1.7.9.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-06 00:03:18 -08:00
f3fb07509c
Update draft release notes to 1.7.10
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-01 15:26:53 -08:00
85da4d459b
Kick off the post 1.7.9 cycle
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-29 13:46:18 -08:00
733137496a
docs: minor grammar fixes for v1.7.9 release notes
...
Signed-off-by: Jeff King <peff@peff.net >
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-26 11:09:08 -08:00
69204d0ab1
Fix typo in 1.7.9 release notes
...
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu >
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-23 10:11:13 -08:00
bddcefc638
Git 1.7.9-rc2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-18 15:53:35 -08:00
6e06367ab0
Merge branch 'maint'
...
* maint:
Git 1.7.8.4
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees
Conflicts:
GIT-VERSION-GEN
2012-01-18 15:52:08 -08:00
c572f491e5
Git 1.7.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-18 15:51:00 -08:00
d899cf559b
Merge branch 'maint-1.7.7' into maint
...
* maint-1.7.7:
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees
Conflicts:
GIT-VERSION-GEN
2012-01-18 15:48:46 -08:00
0065343548
Git 1.7.7.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-18 15:46:31 -08:00
6db5c6e43d
Git 1.7.9-rc1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-12 23:43:28 -08:00
c4a01a3cbb
Merge branch 'maint'
...
* maint:
Update draft release notes to 1.7.8.4
Update draft release notes to 1.7.7.6
Update draft release notes to 1.7.6.6
thin-pack: try harder to use preferred base objects as base
2012-01-12 23:33:39 -08:00
ab8a78084b
Update draft release notes to 1.7.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-12 23:33:29 -08:00
5a6a939481
Merge branch 'maint-1.7.7' into maint
...
* maint-1.7.7:
Update draft release notes to 1.7.7.6
Update draft release notes to 1.7.6.6
thin-pack: try harder to use preferred base objects as base
2012-01-12 23:31:46 -08:00
8f83acf77c
Update draft release notes to 1.7.7.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-12 23:31:41 -08:00
901c907d83
Merge branch 'maint-1.7.6' into maint-1.7.7
...
* maint-1.7.6:
Update draft release notes to 1.7.6.6
thin-pack: try harder to use preferred base objects as base
2012-01-12 23:31:05 -08:00
04f6785a08
Update draft release notes to 1.7.6.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-12 23:30:53 -08:00
e04dc492ac
Sync with maint
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-10 14:46:22 -08:00
be4d2920c2
Prepare for 1.7.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-10 14:27:14 -08:00
55dcc2ebad
Merge the attributes fix in from maint-1.6.7 branch
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-10 14:24:01 -08:00
804e97fc77
Prepare for 1.7.7.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-10 14:16:49 -08:00
6c65b5ea43
Merge the attributes fix in from maint-1.6.6 branch
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-10 14:14:26 -08:00
f14f9803ef
Prepare for 1.7.6.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-10 13:11:03 -08:00
eac2d83247
Git 1.7.9-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-06 12:51:09 -08:00
5de89d3abf
Merge branch 'jc/show-sig'
...
* jc/show-sig:
log --show-signature: reword the common two-head merge case
log-tree: show mergetag in log --show-signature output
log-tree.c: small refactor in show_signature()
commit --amend -S: strip existing gpgsig headers
verify_signed_buffer: fix stale comment
gpg-interface: allow use of a custom GPG binary
pretty: %G[?GS] placeholders
test "commit -S" and "log --show-signature"
log: --show-signature
commit: teach --gpg-sign option
Conflicts:
builtin/commit-tree.c
builtin/commit.c
builtin/merge.c
notes-cache.c
pretty.c
2012-01-06 12:44:07 -08:00
21c6a18c75
Sync with 1.7.8.3
2012-01-06 12:42:48 -08:00
5f4d133fca
Git 1.7.8.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-01-06 12:41:39 -08:00
17b4e93d5b
Update draft release notes to 1.7.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-28 12:07:22 -08:00
48de6569eb
Sync with 1.7.8.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-28 12:04:25 -08:00
f3f778df69
Git 1.7.8.2
...
Contains accumulated fixes since 1.7.8 that have been merged to the
'master' branch in preparation for the 1.7.9 release.
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-28 12:03:24 -08:00
ec330158ec
Update draft release notes in preparation for 1.7.9-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-22 15:36:48 -08:00
5d6dfc7cb1
Update draft release notes to 1.7.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-22 11:43:02 -08:00
e443bdfe1e
Sync with v1.7.8.1
2011-12-21 12:02:44 -08:00
2ce0edcd78
Git 1.7.8.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-21 12:02:13 -08:00
876a6f4991
Update draft release notes to 1.7.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-19 16:39:54 -08:00
ee22802493
Update draft release notes to 1.7.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-16 22:45:03 -08:00
10f4eb652e
Update draft release notes to 1.7.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-13 23:09:27 -08:00
9e6324c4d7
Merge branch 'maint'
...
* maint:
Update draft release notes for 1.7.8.1
Git 1.7.7.5
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf
Conflicts:
RelNotes
2011-12-13 22:18:00 -08:00
7b6c5836cf
Update draft release notes for 1.7.8.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-13 22:08:52 -08:00
8311158c66
Merge branch 'maint-1.7.7' into maint
...
* maint-1.7.7:
Git 1.7.7.5
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf
checkout,merge: loosen overwriting untracked file check based on info/exclude
cast variable in call to free() in builtin/diff.c and submodule.c
apply: get rid of useless x < 0 comparison on a size_t type
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
builtin/fetch.c
2011-12-13 21:58:51 -08:00
66c11f02b0
Git 1.7.7.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-13 21:55:31 -08:00
7857e3246f
Merge branch 'maint-1.7.6' into maint-1.7.7
...
* maint-1.7.6:
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
2011-12-13 21:44:56 -08:00
15b7898c5e
Git 1.7.6.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-13 21:32:30 -08:00
9859a023fe
Update draft release notes for 1.7.9
...
The first two of more important topics slated for 1.7.9 have been merged.
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2011-12-09 13:52:39 -08:00
