repo.or.cz
/
git
/
mingw
/
4msysgit
/
gitPS1fix.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20
Junio C Hamano
M
e
r
ge branch
'
j
c
/ma
i
nt-1
.
7
.
4
-
pathspec
-
s
tdin-and-
c
mdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hama
n
o
M
e
rge b
r
anch
'
rg/copy-
g
ec
o
s-us
e
rname
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch '
j
l/submodu
l
e
-conflic
t
ed-gitmodu
l
es'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Me
r
g
e
br
a
nch 'jc/repl
a
cing'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Me
r
ge
br
a
n
c
h
'
nd/sparse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge bra
n
c
h
'ld/p4-preserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hama
n
o
Me
r
ge branch 'ms/tagname-does-not-begin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
amano
Merge branch
'
jk/git-con
n
ec
t
ion-deadlock-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
am
a
no
Merge br
a
nch 'js/
m
aint-s
e
n
d
-p
a
ck-sta
t
eless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'jk/cher
r
y-pick-root-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Ham
a
no
Me
r
ge branch 'jc/maint-paths
p
ec-stdin-and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
erge 1
.
7
.
5
.
2
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
mano
Revert "Merge branch 'en/merge-
r
ecursive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
G
i
t
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jeff Ki
n
g
Makefil
e
:
sort TE
S
T_PROGRAM
S
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jona
t
ha
n
N
i
ede
r
provide a copy o
f
the LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Je
f
f King
tes
t
cor
e
.
git
p
roxy configurati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
R
a
fael Gieschke
copy_gec
o
s: fix
not adding nlen
to len when processing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Hamano
U
p
dat
e
release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C Hamano
Merg
e
branch
'
js
/
maint-1
.
6
.
6-send-pack-stateles
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'jc/convert'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
ch 'ci/
c
ommit-
-
interactiv
e
-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
mano
Merge branch 'sg/
c
o
m
pletion-u
p
dates
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch '
k
k
/
maint-p
r
efix-in-c
o
nf
i
g-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'mg/merge-ff-c
o
nfi
g
'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
m
a
no
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
a
m
ano
Update draft release
n
ot
e
s
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Hamano
Merge branch 'jn/maint-format-p
a
tch-do
c
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch 'ss/cherry-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C Hamano
Merge branch 'vr/
m
e
r
ge-
b
a
se-doc'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge bran
c
h 'sr/maint-fast-
i
mport-tighten
-
o
pt
i
on-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
ch 'jc/t150
6
-s
h
e
l
l
-param-expansion-
g
otc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'jc/
f
ix
-
a
dd-u-unmerged
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Ham
a
no
Merge branch 'jn/gitweb
-
dependency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C
Ha
m
ano
Merge br
a
nch '
j
c
/
m
a
i
nt-branch-mergeoptio
n
s' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branc
h
'jc/maint-
a
dd-p-overl
a
pping
-
hunk
s
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Me
y
er
i
ng
Document
a
tion/git-f
s
ck
.
txt: f
i
x
t
ypo: unr
e
adable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
s
end-pack
:
avoid
d
e
a
d
lock on
g
it:// push with failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
Ki
n
g
connect
:
let callers know if connection is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
on
n
ect:
t
reat ge
n
eric
p
r
oxy processe
s
like ssh processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
sideband_demux(): fix decl-after-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
t3503: test cherry
picking and reverting root commi
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
Kin
g
revert:
a
llow
r
everti
n
g a root
c
ommit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
cherry-pick
:
handle root comm
i
t
s
w
ith e
x
ternal
s
tr
a
t
e
g
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
S
y
n
c
r
ele
a
s
e notes for 1
.
7
.
6 to
e
x
clu
d
e
w
hat are in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Update draft rel
e
as
e
n
o
tes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C Ham
a
no
Merge branch 'cn/for
m
at-patch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Ham
a
no
Merge bra
n
ch 'jm/merge
t
ool-
s
ubmodules'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merg
e
branc
h
'
jk/f
o
rmat
-
pa
t
c
h
-quote-sp
e
cial-in-f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
r
g
e
branch 'vh/git
-
svn-
d
oc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Haman
o
git_op
e
n_noatime()
:
dr
o
p
unused pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
a
mano
sha1_file: typo
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
read_sha
1
_
f
ile(): a
l
lo
w
selective bypassing of repla
c
e
m
e
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
i
nli
n
e lookup_replace
_
o
b
j
ect() c
a
lls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
read_sha1_fi
l
e(): get rid of
r
ead_sha1
_
file_repl()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Hamano
t60
5
0
:
make sure
w
e test not just commit repl
a
cem
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
D
eclare
l
o
o
kup_replace_
o
bject() in cache
.
h,
n
ot
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
than Nieder
add, m
e
rge, dif
f
: do
n
ot use st
r
case
c
m
p to compar
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-14
Je
n
s Lehmann
Submodules
:
Don't parse
.
g
itmodules when it
c
o
ntains
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-14
Heik
o
Voigt
test
that git status works
w
ith
merge conf
l
ict in,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Luke Dia
m
and
git-p4: warn if git author
s
hip won'
t
be reta
i
n
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Upd
a
te
d
raft re
l
ease
notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hama
n
o
Merge branch
'
b
f
/commit-templa
t
e-no
-
cleanup
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nch 'jc/t1506-shell-par
a
m-expansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'rr/rerere-lib
i
fy-cle
a
r-
g
c'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
n
ch 'js/main
t
-send
-
pac
k
-
s
tateless-
r
pc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
a
n
ch 'jh/dirstat-lin
e
s'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Ham
a
no
Merge branch '
j
c/fix-add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'jn/setup-revision
s
-
glob-
a
n
d
-friends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch 'cn/log-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Prepare for
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
e
rg
e
b
r
anch 'aw/
m
aint-rebase-i-p-n
o
-ff' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge b
r
anc
h
'js/blam
e
-parsenam
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge bra
n
ch 'gr/cvsimport-alt
e
rna
t
ive-cvspa
s
s
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
a
mano
Merge b
r
a
nch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
Hamano
Merge branch 'jk/merge-one-f
i
le-
w
orking-tree'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
branch 'jc/fi
x
-diff-file
s
-unmerge
d
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Ham
a
no
M
e
rge branch 'mz/m
a
int-
r
enam
e
-u
n
merged'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t5400:
F
ix
a
couple of typ
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
n
o
Merge branc
h
'nd/str
u
ct-pat
h
sp
e
c'
commit
|
commitdiff
|
tree
2011-05-13
J
o
hannes Sixt
Twe
a
k t3102-l
s
-tree-wildcards to r
u
n on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
erge branch '
j
c/mai
n
t-1
.
7
.
4-pathspec-stdin
-
a
n
d
-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Merge
branch 'j
c
/ma
i
n
t
-
1
.
6
.
6-pa
t
hsp
e
c
-stdin
-
and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C Hamano
M
erge br
a
nch
'jc/maint-1
.
6
.
6-pathspec-stdin-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
set
u
p_revisions
(
): take pathspec from
command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Updat
e
dra
f
t release notes t
o
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jn/gitw
e
b
-
depen
d
e
ncy
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
Merge branch 'jc/maint
-
branch-
m
e
r
geo
p
tions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
rge br
a
nch 'jn/maint-t
e
st-merge-verify-
p
arents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Merge branch 'vh/config
-
inter
a
ctiv
e
-
singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C
Hamano
Mer
g
e branch
'
jc/maint-add-p-ov
e
r
l
a
ppi
n
g-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge br
a
nch 'sr/maint-fast-import-tighten-opt
i
on-par
s
ing'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Merge branch 'dm/http-c
l
eanup
'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Ham
a
no
Merge bran
c
h '
j
n/ct
a
gs'
commit
|
commitdiff
|
tree
2011-05-11
Boris
F
a
u
re
Do not str
i
p empty lines /
trail
i
ng spaces from
a
c
o
m
m
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Merge branch 'fc/c
o
mple
t
i
o
n-z
s
h'
i
nto sg
/
c
om
p
letio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Rever
t
"completio
n
:
don't declare '
l
oca
l
words' to
.
.
.
commit
|
commitdiff
|
tree
next