mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 05:33:04 +01:00
Code Activity
29564 commits 6 branches 956 tags 518 MiB
Commit graph

317 commits

Author SHA1 Message Date
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