25a7850a10
Merge branch 'maint'
...
* maint:
Update draft release notes to 1.7.9.3
CodingGuidelines: do not use 'which' in shell scripts
CodingGuidelines: Add a note about spaces after redirection
post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
post-receive-email: remove unused variable
2012-02-27 15:37:02 -08:00
b0fa280751
Update draft release notes to 1.7.9.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-27 15:36:08 -08:00
3724cc7c58
Update draft release notes to 1.7.10
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-26 23:11:10 -08:00
8080906245
Merge branch 'maint'
...
* maint:
Document accumulated fixes since 1.7.9.2
Git 1.7.8.5
grep -P: Fix matching ^ and $
am: don't infloop for an empty input file
rebase -m: only call "notes copy" when rewritten exists and is non-empty
git-p4: remove bash-ism in t9800
git-p4: remove bash-ism in t9809
git-p4: fix submit regression with clientSpec and subdir clone
git-p4: set useClientSpec variable on initial clone
Makefile: add thread-utils.h to LIB_H
Conflicts:
RelNotes
t/t9809-git-p4-client-view.sh
2012-02-26 17:39:04 -08:00
62ed0728fe
Document accumulated fixes since 1.7.9.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-26 17:08:59 -08:00
4d06691eec
Sync with 1.7.8.5
2012-02-26 16:42:35 -08:00
c524ceb12f
Git 1.7.8.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-26 16:40:20 -08:00
ba998d33e2
Update draft release notes to 1.7.10
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-23 13:38:50 -08:00
bd444cadb5
Update draft release notes to 1.7.10
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-21 15:29:29 -08:00
887c409a7a
Merge branch 'maint'
...
* maint:
Update draft release notes to 1.7.9.2
completion: Allow dash as the first character for __git_ps1
2012-02-21 15:18:00 -08:00
72d5e74e99
Update draft release notes to 1.7.9.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-21 15:16:34 -08:00
b3a769dc35
Update draft release notes to 1.7.10
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-20 00:29:40 -08:00
2c8fb23ac7
Merge branch 'maint'
...
* maint:
Update draft release notes to 1.7.9.2
gitweb: Fix 'grep' search for multiple matches in file
2012-02-20 00:14:17 -08:00
233054d114
Update draft release notes to 1.7.9.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-20 00:14:00 -08:00
b0d66b5110
Sync with maint
2012-02-16 14:27:20 -08:00
d1ba7a4cb7
Update draft release notes to 1.7.9.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-16 14:26:32 -08:00
5f90b6fa0f
Sync with 1.7.9.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-14 09:56:23 -08:00
90020e3bcd
Git 1.7.9.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-14 09:53:38 -08:00
6f5e880c68
Sync with maint
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-13 11:48:00 -08:00
58d4203aa6
Update draft release notes to 1.7.9.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com >
2012-02-13 11:46:47 -08:00
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
