undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,045 Commits 1 Branch 0 Tags 217 MiB
0df860383e
Commit Graph

494 Commits

Author SHA1 Message Date
Junio C Hamano
26e5c5d093 Git 1.7.10.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-25 11:28:43 -07:00
Junio C Hamano
5bc2dc29d4 Sync with maint 
By Jeff King (1) and Junio C Hamano (1)
* maint:
  Update draft release notes to 1.7.10.3
  osxkeychain: pull make config from top-level directory
 2012-05-24 17:37:40 -07:00
Junio C Hamano
c4649188e9 Update draft release notes to 1.7.10.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-24 17:37:29 -07:00
Junio C Hamano
bd578b507f Update draft release notes to 1.7.11 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-23 13:54:23 -07:00
Junio C Hamano
6a4a482229 Update draft release notes for 12th batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-14 12:20:46 -07:00
Junio C Hamano
3f8acaae8a Sync with maint 2012-05-14 11:50:20 -07:00
Junio C Hamano
5bed9f6a61 Start preparing for 1.7.10.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-14 11:47:20 -07:00
Junio C Hamano
cd07cc5312 Update draft release notes to 1.7.11 (11th batch) 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-11 11:40:43 -07:00
Junio C Hamano
0ef576d308 Sync with 1.7.10.2 2012-05-11 11:29:02 -07:00
Junio C Hamano
b6555d731e Git 1.7.10.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-11 11:25:28 -07:00
Junio C Hamano
b7fbce05e5 The tenth batch of topics 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-10 11:04:31 -07:00
Junio C Hamano
2c78c91db7 Merge branch 'maint' 2012-05-10 10:45:47 -07:00
Junio C Hamano
5ad3e16a6f Update draft release notes to 1.7.10.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-10 10:45:42 -07:00
Junio C Hamano
a3935e6791 The ninth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-07 13:39:38 -07:00
Junio C Hamano
ad799ea375 Sync with maint 2012-05-07 13:28:34 -07:00
Junio C Hamano
42325fb2e0 Start preparing for 1.7.10.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-07 13:24:32 -07:00
Junio C Hamano
34875f4a53 The eighth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-02 14:38:43 -07:00
Junio C Hamano
07bc4f5870 Sync with v1.7.10.1 2012-05-01 21:21:46 -07:00
Junio C Hamano
bf505158d0 Git 1.7.10.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-01 21:18:44 -07:00
Junio C Hamano
10d4332e00 The seventh batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-29 18:00:47 -07:00
Junio C Hamano
62bc83349d The sixth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-27 14:12:56 -07:00
Junio C Hamano
010b260e6f Update draft release notes to 1.7.11 
A handful of topics have been merged to maintenance releases, and
the first half of 6th batch graduates to 'master'.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 11:04:41 -07:00
Junio C Hamano
210a75c38c Merge bundle error message fix in 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:55:08 -07:00
Junio C Hamano
868d662399 Start preparing for 1.7.10.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:53:55 -07:00
Junio C Hamano
50bf38ac23 Sync with 1.7.9.7 2012-04-26 10:31:43 -07:00
Junio C Hamano
d0f1ea6003 Git 1.7.9.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:23:15 -07:00
Junio C Hamano
b2bab5b338 Sync with 1.7.8.6 2012-04-26 10:22:20 -07:00
Junio C Hamano
d9f5ef7a4a Git 1.7.8.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:14:45 -07:00
Junio C Hamano
aba5f57c8f Sync with 1.7.7.7 2012-04-26 09:52:33 -07:00
Junio C Hamano
8258858493 Git 1.7.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 09:41:52 -07:00
Junio C Hamano
f9d995d5dd The fifth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-24 14:50:06 -07:00
Junio C Hamano
aa39b858a3 RelNotes: the fourth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-23 13:30:22 -07:00
Junio C Hamano
d1ca788fcd RelNotes: the third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-20 15:58:40 -07:00
Junio C Hamano
0bb2ee1b7d RelNotes: the second batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-16 12:55:11 -07:00
Junio C Hamano
146fe8ce24 RelNotes: the first batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-15 22:59:31 -07:00
Junio C Hamano
36e6c803a1 Kick off post 1.7.10 cycle 
I tentatively named the release notes "1.7.11" but this may have to
be renamed to "1.8" or some other name later.  Let's see how well
we would do during this cycle.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-11 12:17:17 -07:00
Junio C Hamano
e8dde3e5f9 Git 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-06 10:47:58 -07:00
Junio C Hamano
e5056c05ec Git 1.7.10-rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-03 09:30:58 -07:00
Junio C Hamano
d82829b612 Sync with 1.7.9.6 2012-04-02 13:11:49 -07:00
Junio C Hamano
cb2ed324fc Git 1.7.9.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-02 13:07:58 -07:00
Junio C Hamano
455cf268db Git 1.7.10-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-28 11:18:42 -07:00
Junio C Hamano
fae9d761c7 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-26 12:38:34 -07:00
Junio C Hamano
ee459baa5c Git 1.7.9.5 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcMOYAAoJELC16IaWr+bLGoQP/2nHXaa6SBovRWgjDpqlVCdI
 xzrUmpkDre5fqTwxuvXF2xfCXT+vzO5kI/pxI58IVlrp9AueVyalkP0M1kJWPMMw
 1esBc4N9Hgc9N3tDDLYOSeJTwozoqv5fiv+Kexecpc1nguP3fEgLfPcjQ9LFb9s3
 pGMr1FroqnX3TLKlcHB3FFO/0fojMtZ+NJOOFV8rCqe+0khcy41+f2FeGL/6eLja
 kTnfC+WewoUcSKjAUd19xPk+QZ0xVh69/aV4jv64mpBcFPTv/8YJTOp5A6d5I/UP
 adoH64rG6h8B4SpUOIHubXpLC5XdDYkinjnSOKkMiSeolPJPInSuS4pZy86YWpYt
 pKEI3/rxh/TbK7F9LnJhunbPX6j2MpZywIt7/ux8idwjyU7z/IRTeetrqRhG1Pno
 av3Fgez/gNOPSDiABEv9Kn3QLSj4IfHCtT+Ih7ejzKk8sCCCFCucueINsdl6EVni
 sQRN1E+UKcRUhIIdPZWvwop6IzbFGCkqFthup2gOiAZfZj9j27Ht1TOl7vDWvsOK
 +Vlff+kzJIXxbiiXhjVAX3RjAKj8Dq0jILXhmu6p60e6FkQuLwN/YcMKhwW1IJgq
 58g22g6CAIgXeItttCdv690qVM3KE7c+sR3S1aJyQdzDsBu1J5wPTUmeY5aBjQGZ
 1kHlftCTxQ5H8HFRmURT
 =pq47
 -----END PGP SIGNATURE-----

Sync with 1.7.9.5
 2012-03-26 12:30:51 -07:00
Junio C Hamano
8ced9c90a2 Git 1.7.9.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-26 12:29:25 -07:00
Junio C Hamano
c16df57c5a Git 1.7.10-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-23 15:11:24 -07:00
Junio C Hamano
bc62ca13c0 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-16 08:42:22 -07:00
Junio C Hamano
0e2d57fd50 Git 1.7.10-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-14 15:47:45 -07:00
Junio C Hamano
6c15a1c636 am: officially deprecate -b/--binary option 
We have had these options as harmless no-op for more than 3 years without
officially deprecating them.  Let's announce the deprecation and start
warning against their use, but without failing the command just not yet,
so that we can later repurpose the option if we want to in the future.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-13 12:21:04 -07:00
Junio C Hamano
fa678feb7c Update draft release notes to 1.7.10 before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-12 15:59:06 -07:00
Junio C Hamano
3101a748dc Sync with 1.7.9.4 2012-03-12 15:54:21 -07:00
Junio C Hamano
a46034819e Git 1.7.9.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-12 15:52:52 -07:00
Junio C Hamano
42e52e358b Update draft release notes to 1.7.10 
Also apply typofixes people on the list helped spotting and
correcting.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-08 13:08:54 -08:00
Junio C Hamano
56a33c8f1b Git 1.7.10-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-07 12:51:55 -08:00
Junio C Hamano
4a92a17214 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-04 23:38:02 -08:00
Junio C Hamano
91527e54d5 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.9.3 for the last time
  http.proxy: also mention https_proxy and all_proxy
  t0300: work around bug in dash 0.5.6
  t5512 (ls-remote): modernize style
  tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
 2012-03-04 22:21:52 -08:00
Junio C Hamano
ead8eb8c10 Update draft release notes to 1.7.9.3 for the last time 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-04 22:21:30 -08:00
Junio C Hamano
222433ee4b Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-02 11:49:41 -08:00
Junio C Hamano
66b8800e53 Merge branch 'rs/no-no-no-parseopt' 
* rs/no-no-no-parseopt:
  parse-options: remove PARSE_OPT_NEGHELP
  parse-options: allow positivation of options starting, with no-
  test-parse-options: convert to OPT_BOOL()

Conflicts:
	builtin/grep.c
 2012-03-01 20:59:31 -08:00
Junio C Hamano
f051ad6d11 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-28 13:31:05 -08:00
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
4d06691eec Sync with 1.7.8.5 2012-02-26 16:42:35 -08:00
Junio C Hamano
c524ceb12f Git 1.7.8.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-26 16:40:20 -08:00
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
b0d66b5110 Sync with maint 2012-02-16 14:27:20 -08:00
Junio C Hamano
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
Junio C Hamano
5f90b6fa0f Sync with 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-14 09:56:23 -08:00
Junio C Hamano
90020e3bcd Git 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-14 09:53:38 -08:00
Junio C Hamano
6f5e880c68 Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-13 11:48:00 -08:00
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
1e9d3e3663 Sync with maint 2012-02-10 14:07:00 -08:00
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
65da088244 Sync with maint 2012-02-06 00:04:47 -08:00
Junio C Hamano
2d1abfa8ee Prepare for 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-06 00:03:18 -08:00
Junio C Hamano
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
Junio C Hamano
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
Jeff King
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
Michael Haggerty
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
Junio C Hamano
bddcefc638 Git 1.7.9-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-18 15:53:35 -08:00
Junio C Hamano
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
Junio C Hamano
c572f491e5 Git 1.7.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-18 15:51:00 -08:00
Junio C Hamano
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
Junio C Hamano
0065343548 Git 1.7.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-18 15:46:31 -08:00
Junio C Hamano
6db5c6e43d Git 1.7.9-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-12 23:43:28 -08:00
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
e04dc492ac Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:46:22 -08:00
Junio C Hamano
be4d2920c2 Prepare for 1.7.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:27:14 -08:00
Junio C Hamano
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
Junio C Hamano
804e97fc77 Prepare for 1.7.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:16:49 -08:00
Junio C Hamano
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
Junio C Hamano
f14f9803ef Prepare for 1.7.6.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 13:11:03 -08:00
Junio C Hamano
eac2d83247 Git 1.7.9-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-06 12:51:09 -08:00
Junio C Hamano
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
Junio C Hamano
21c6a18c75 Sync with 1.7.8.3 2012-01-06 12:42:48 -08:00
Junio C Hamano
5f4d133fca Git 1.7.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-06 12:41:39 -08:00
Junio C Hamano
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
Junio C Hamano
48de6569eb Sync with 1.7.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:04:25 -08:00
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
e443bdfe1e Sync with v1.7.8.1 2011-12-21 12:02:44 -08:00
Junio C Hamano
2ce0edcd78 Git 1.7.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-21 12:02:13 -08:00
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
66c11f02b0 Git 1.7.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 21:55:31 -08:00
Junio C Hamano
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
Junio C Hamano
15b7898c5e Git 1.7.6.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 21:32:30 -08:00
Junio C Hamano
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
Junio C Hamano
7e02a6c63a Kick-off the 1.7.9 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-05 15:49:34 -08:00
Junio C Hamano
406da78032 Git 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-02 10:02:52 -08:00
Junio C Hamano
fc14b89a7e Git 1.7.8-rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-28 14:07:22 -08:00
Junio C Hamano
017d1e1345 Update 1.7.8 draft release notes in preparation for rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-22 18:23:36 -08:00
Junio C Hamano
f56ef114ee Hopefully final update of release notes before 1.7.8 final 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-18 14:19:45 -08:00
Junio C Hamano
4c00c852b3 Sync with 1.7.7.4 2011-11-18 11:30:02 -08:00
Junio C Hamano
bd5bce7cbc Git 1.7.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-18 11:28:05 -08:00
Junio C Hamano
4d2440fe0d Git 1.7.8-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-17 11:06:15 -08:00
Junio C Hamano
bc1bbe0c19 Git 1.7.8-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-12 22:14:53 -08:00
Junio C Hamano
8a04247896 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:42:33 -08:00
Junio C Hamano
14ba45a2e6 Sync with 1.7.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:38:14 -08:00
Junio C Hamano
d4d5ab4727 Git 1.7.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:37:00 -08:00
Junio C Hamano
4cb6764227 Git 1.7.8-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-07 16:48:34 -08:00
Junio C Hamano
87bf9a7048 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:44:57 -07:00
Junio C Hamano
79eec363d2 Sync with 1.7.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:43:50 -07:00
Junio C Hamano
8d19b44b31 Git 1.7.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:41:57 -07:00
Junio C Hamano
be3fa9125e Git 1.7.8-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-30 19:14:24 -07:00
Junio C Hamano
e8e1c29021 Update draft release notes to 1.7.8 
Getting very close to -rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-27 12:06:44 -07:00
Junio C Hamano
425c771534 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-26 16:23:26 -07:00
Junio C Hamano
10b2a48113 Merge branch 'maint' 
* maint:
  Git 1.7.7.1
  RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

Conflicts:
	GIT-VERSION-GEN
 2011-10-23 21:49:14 -07:00
Jonathan Nieder
7fe74f52f9 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting 
The change was actually about "git init -s" which sets the setgid bit on
SysV-style systems to allow shared access to a repository, and can provoke
errors on BSD-style systems, depending on how permissive the filesystem in
use wants to be.

More to the point, the patch was just taking a fix that arrived for
FreeBSD in v1.5.5 days and making it also apply to machines using an
(obscure) GNU userland/FreeBSD kernel mixture.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-23 21:16:31 -07:00
Junio C Hamano
e454a83fa2 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-21 16:05:42 -07:00
Junio C Hamano
8963314c77 Sync with maint 2011-10-21 11:24:34 -07:00
Junio C Hamano
8742218f21 Almost ready for 1.7.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-21 11:01:07 -07:00
Junio C Hamano
87009edcbd Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-19 11:02:13 -07:00
Junio C Hamano
08cfdbb88c Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-17 22:08:25 -07:00
Junio C Hamano
05f6edcd2a Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-16 10:58:35 -07:00
Junio C Hamano
288396994f Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-15 20:59:50 -07:00
Junio C Hamano
16b3b2d969 Prepare for 1.7.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-15 20:55:12 -07:00
Junio C Hamano
c9e7aa4f68 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-13 22:18:04 -07:00
Junio C Hamano
34c4461ae3 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-12 12:42:44 -07:00
Junio C Hamano
8b0e15fa95 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-10 16:14:59 -07:00
Junio C Hamano
7f41b6bbe3 Post 1.7.7 first wave 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-05 12:54:35 -07:00
Junio C Hamano
703f05ad58 Git 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-30 14:20:57 -07:00
Junio C Hamano
85e9c7e1d4 Git 1.7.7-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 15:35:57 -07:00
Junio C Hamano
b7619006eb Merge 1.7.6.4 in 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 15:31:08 -07:00
Junio C Hamano
6320526415 Git 1.7.6.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 14:43:05 -07:00
Junio C Hamano
167a5800cb Git 1.7.7-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-18 15:41:34 -07:00
Junio C Hamano
81a5bdd9c5 Sync with 1.7.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-12 10:43:17 -07:00
Junio C Hamano
740a8fc224 Git 1.7.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-12 10:33:40 -07:00
Junio C Hamano
2f9e2e7587 Merge branch 'maint' 
* maint:
  Prepare for 1.7.6.3 maintenance release
  SubmittingPathces: remove Cogito reference

Conflicts:
	RelNotes
 2011-09-11 22:35:11 -07:00
Junio C Hamano
c2d53586dd Prepare for 1.7.6.3 maintenance release 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-11 22:33:27 -07:00
Michael J Gruber
3793ac56b4 RelNotes/1.7.7: minor fixes 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-07 16:29:18 -07:00
Junio C Hamano
50963badbc Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:48:21 -07:00
Junio C Hamano
48f36dcd73 Sync with 1.7.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:42:12 -07:00
Junio C Hamano
509d59705e Git 1.7.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:41:02 -07:00
Junio C Hamano
b32128793d Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-02 13:26:02 -07:00
Junio C Hamano
e7734c6c9b Merge branch 'gb/maint-am-patch-format-error-message' 
* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch

Conflicts:
	git-am.sh
 2011-09-02 13:18:07 -07:00
Junio C Hamano
826603d118 Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-28 21:49:35 -07:00
Junio C Hamano
a452d148d1 Git 1.7.7-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-25 21:00:46 -07:00
Junio C Hamano
8d9185bc12 Update draft release notes to 1.7.7 2011-08-23 15:44:50 -07:00
Junio C Hamano
d0b46502de Merge branch 'maint' 
* maint:
  Update draft release notes for 1.7.6.1
 2011-08-23 15:29:08 -07:00
Junio C Hamano
b0b35a6ac3 Update draft release notes for 1.7.6.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-23 15:28:18 -07:00
Junio C Hamano
cee426811c Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-18 22:10:23 -07:00
Junio C Hamano
f85a051d13 Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-17 17:48:36 -07:00
Junio C Hamano
4bfe7cb666 Sync with "maint" 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-16 14:23:43 -07:00
Junio C Hamano
50b68aeb39 Merge branch 'maint' 
* maint:
  Prepare for 1.7.6.1
  am: refresh the index at start and --resolved

Conflicts:
	GIT-VERSION-GEN
	RelNotes
 2011-08-16 14:22:26 -07:00
Junio C Hamano
8499644ea7 Prepare for 1.7.6.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-16 12:42:17 -07:00
Junio C Hamano
b91766295f Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-11 12:12:22 -07:00
Junio C Hamano
5c2f84599c Update draft release notes to 1.7.7 
The third batch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-22 15:32:03 -07:00
Junio C Hamano
d79bcd6805 Update draft release notes to 1.7.7 
The second batch of topics for this cycle are now in.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-19 10:44:51 -07:00
Junio C Hamano
cf13f6ca40 Start 1.7.7 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-06 17:00:46 -07:00
Junio C Hamano
f696543dad Git 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-26 12:41:16 -07:00
Junio C Hamano
302bd999fd Git 1.7.6-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-16 09:21:36 -07:00
Junio C Hamano
2cbd969bcf Git 1.7.6-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-08 18:29:48 -07:00
Junio C Hamano
a6605d76cd Sync with 1.7.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-01 14:11:17 -07:00
Junio C Hamano
e5af0de202 Git 1.7.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-01 14:08:26 -07:00
Junio C Hamano
090a1a5d95 Update draft release notes to 1.7.6 
I think we are almost there for the feature freeze.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-31 12:22:50 -07:00
Junio C Hamano
2951df7a9a Sync with maint 2011-05-31 12:07:14 -07:00
Junio C Hamano
2b0b64ee85 Start 1.7.5.4 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-31 12:06:40 -07:00
Junio C Hamano
665b051b90 Update 1.7.6 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:41:33 -07:00
Junio C Hamano
1dcfb2ac65 Sync with 1.7.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:30:28 -07:00
Junio C Hamano
3c3e0b3c41 Git 1.7.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:29:29 -07:00
Junio C Hamano
5df3e2b3ca Update 1.7.6 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-23 10:54:54 -07:00
Junio C Hamano
11bc3e92bf Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-19 21:02:20 -07:00
Junio C Hamano
b602ed7dea Update release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-16 17:19:24 -07:00
Junio C Hamano
6c7471bcf1 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.5.2
  Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
 2011-05-16 16:44:57 -07:00
Junio C Hamano
ea1ab4b280 Update draft release notes to 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-16 16:44:50 -07:00
Junio C Hamano
c565cb452c Sync release notes for 1.7.6 to exclude what are in maintenance track 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-15 16:19:16 -07:00
Junio C Hamano
f574cb3404 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.5.2
  git_open_noatime(): drop unused parameter
  sha1_file: typofix
 2011-05-15 16:16:56 -07:00
Junio C Hamano
96dbe93da5 Update draft release notes to 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-15 16:11:55 -07:00
Junio C Hamano
2de58b398b Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-13 11:14:07 -07:00
Junio C Hamano
32341b9df5 Merge branch 'maint' 
* maint:
  Prepare for 1.7.5.2
  t5400: Fix a couple of typos

Conflicts:
	RelNotes
 2011-05-13 10:58:10 -07:00
Junio C Hamano
375f8a032e Prepare for 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-13 10:57:09 -07:00
Junio C Hamano
dbe9c5adf9 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-11 11:56:11 -07:00
Junio C Hamano
4e3aa87d13 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-06 11:13:08 -07:00
Junio C Hamano
505a138cbd Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 16:02:17 -07:00
Junio C Hamano
7ab576ce2d Sync with 1.7.5.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 15:49:04 -07:00
Junio C Hamano
2f312e8851 Git 1.7.5.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 15:47:40 -07:00
Junio C Hamano
0b9deecf62 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-02 16:10:50 -07:00
Junio C Hamano
791a765e54 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-01 16:29:43 -07:00
Junio C Hamano
1c08bf50cf Merge branch 'maint' 
* maint:
  Start 1.7.5.1 maintenance track
  git-send-email: fix missing space in error message

Conflicts:
	RelNotes
 2011-04-29 11:48:13 -07:00
Junio C Hamano
65f13f20bc Start 1.7.5.1 maintenance track 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-29 11:47:35 -07:00
Junio C Hamano
e839fe6c12 Start 1.7.6 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-27 12:09:04 -07:00
Junio C Hamano
6ceb270ce6 Git 1.7.5-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-19 11:51:00 -07:00
Junio C Hamano
0e73bb4dfc Sync with 1.7.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-19 11:49:13 -07:00
Junio C Hamano
4fec83045b Git 1.7.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-19 11:45:38 -07:00
Junio C Hamano
865d370c4d Git 1.7.5-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-13 14:02:00 -07:00
Junio C Hamano
6be0559183 Git 1.7.5-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-06 10:57:32 -07:00
Junio C Hamano
e38f2a88e5 Sync with 1.7.4.4 2011-04-06 10:51:30 -07:00
Junio C Hamano
5fb41b883a Git 1.7.4.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-06 10:50:00 -07:00
Junio C Hamano
44bc573436 Merge branch 'maint' 
* maint:
  Start preparing for 1.7.4.4
  pull: do not clobber untracked files on initial pull
  compat: add missing #include <sys/resource.h>

Conflicts:
	RelNotes
 2011-04-03 13:53:11 -07:00
Junio C Hamano
8e848868ff Start preparing for 1.7.4.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-03 12:58:23 -07:00
Junio C Hamano
cb35c0646d Update release notes 
As 1.7.4.3 has backmerged a handful of fixes from the master,
drop these entries from 1.7.5 release notes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-03 00:18:50 -07:00
Junio C Hamano
8f84c95fb2 Sync with 1.7.4.3 2011-04-03 00:14:16 -07:00
Junio C Hamano
d83a831bf4 Git 1.7.4.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-03 00:12:31 -07:00
Junio C Hamano
6acef04358 Git 1.7.5-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-31 13:58:47 -07:00
Junio C Hamano
be919d50c0 Update draft release note to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-26 20:17:15 -07:00
Junio C Hamano
421446b6fc Sync with 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-25 17:57:08 -07:00
Junio C Hamano
78bc466753 Git 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-25 17:56:14 -07:00
Junio C Hamano
5e839c8f6d Update draft release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-22 22:02:24 -07:00
Junio C Hamano
08c8d55813 Update drart release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-20 22:24:24 -07:00
Junio C Hamano
cdc34664d4 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.4.2
  Work around broken ln on solaris as used in t8006
  t/README: Add a note about running commands under valgrind
 2011-03-20 22:14:47 -07:00
Junio C Hamano
d98f24cd9d Update draft release notes to 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-20 22:14:21 -07:00
Michael J Gruber
a3ca9b0fbe RelNotes/1.7.5.txt: typo and language fixes 
Also remove entries for fixes that are already present in the
maintenance track.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-16 17:02:58 -07:00
Junio C Hamano
b2f6eab402 Merge branch 'maint' 
* maint:
  Prepare draft release notes to 1.7.4.2
  gitweb: highlight: replace tabs with spaces
  make_absolute_path: return the input path if it points to our buffer
  valgrind: ignore SSE-based strlen invalid reads
  diff --submodule: split into bite-sized pieces
  cherry: split off function to print output lines
  branch: split off function that writes tracking info and commit subject
  standardize brace placement in struct definitions
  compat: make gcc bswap an inline function
  enums: omit trailing comma for portability

Conflicts:
	RelNotes
 2011-03-16 16:59:30 -07:00
Junio C Hamano
fbcda3c0a7 Prepare draft release notes to 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-16 16:47:40 -07:00
Junio C Hamano
a62eafb0aa Update draft release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-15 15:17:54 -07:00
Junio C Hamano
83c3c6222a Update Release Notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-09 16:21:16 -08:00
Junio C Hamano
afb0b7933f Start preparing release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-02-28 12:28:20 -08:00
Junio C Hamano
9971d6d52c Git 1.7.4.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-02-11 14:39:55 -08:00