mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 07:24:50 +01:00
Code Activity
28220 commits 6 branches 956 tags 532 MiB
Commit graph

241 commits

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