repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/cherry-pick-root-with-resolve' into maint
2011-05-26
Junio C H
a
m
a
no
Merge branch
'
jk
/
cherry-pick-root-wi
t
h-re
s
olve' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'rg/copy-gecos-username
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C H
a
m
a
no
Merge branch 'fc/complet
i
on-zsh' in
t
o
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/git-conn
e
cti
o
n-deadlock-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ha
m
ano
Merg
e
branc
h
'
j
s
/
maint-send-pack
-
statele
s
s-rpc-dea
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
a
m
ano
Merge br
a
nch 'svn-fe-maint' of
g
i
t://repo
.
o
r
.
c
z
/
git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai Ngoc Duy
init/cl
o
ne: remove short option -
L
and do
c
um
e
nt --separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Mich
a
el J
G
ru
b
er
git-svn: F
i
x gi
t
svn log --show-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Gi
t
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
o
natha
n
N
i
e
der
p
rov
i
de a c
o
py o
f
the L
G
P
Lv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff
K
i
n
g
te
s
t co
r
e
.
gitproxy
c
onfigurat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
R
a
f
a
el Giesch
k
e
co
p
y_ge
c
os: fix not a
d
d
ing nlen
to len when proces
s
ing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C
Hamano
Mer
g
e branch 'js/mai
n
t-1
.
6
.
6-send-pack-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
am
a
no
Updat
e
draft release
n
otes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Haman
o
Merge branch 'jn/
m
aint-for
m
at-patch
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'ss/cherry-pick-
x
-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
ama
n
o
Merge branch 'vr/merge-base
-
doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
s
r/maint-f
a
st-import-tigh
t
en-
o
ption-pa
r
sing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
Merge branch
'
jc
/
t150
6
-
shell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'jc/fix-add-u-unm
e
rged
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
H
a
mano
Merge branch
'jn/git
w
eb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Me
r
ge branch 'jc/mai
n
t-branch-mergeoptions' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
r
a
n
ch 'jc/maint-add-p-over
l
apping
-
hu
n
k
s
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
M
ey
e
rin
g
D
o
c
u
m
en
t
ation/git-fsck
.
t
xt: f
i
x typo: unr
e
adable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
sen
d
-pa
c
k: avoid
d
ead
l
ock o
n
g
i
t:// push with failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: let callers know if connec
t
i
o
n
is
a so
c
ket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
conn
e
ct: tr
e
at generic proxy proc
e
s
s
es lik
e
ssh processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
s
ideba
n
d_demux
(
): fix decl-after-stm
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: test che
r
r
y
p
i
c
king and revertin
g
root commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
revert: all
o
w
r
everting a root commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
cherry-pi
c
k
: ha
n
dle root commits w
i
th external strateg
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C
Haman
o
U
p
date draft release notes
t
o 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'cn/format-patch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hama
n
o
M
e
rge branch 'j
m
/mergeto
o
l-submodul
e
s
' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Me
r
g
e
branch
'jk/format-pa
t
ch-quo
t
e-speci
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
g
e
b
r
anch 'vh/git-svn-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
git_open_noatime(): drop u
n
used parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
s
h
a1_file
:
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
a
dd
,
merge, diff: do n
o
t use strcasecmp to compa
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Pre
p
are 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
rge branch 'aw/maint-rebase-i-p
-
no-ff'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
aman
o
Merge branc
h
'js/blame-p
a
rsename'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsimpo
r
t-al
t
ernat
i
ve-c
v
spass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge bra
n
ch 'c
j
/p4merge' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branch '
j
k/merge-on
e
-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
M
erge bra
n
c
h
'jc/fix-diff-fi
l
es-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C H
a
mano
M
erge branch 'mz/main
t
-r
e
na
m
e
-
unmerg
e
d'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400:
Fix a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Fe
l
ip
e
Contrera
s
git-comple
t
ion: fix regres
s
ion in zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Haman
o
t1507: avoid "${pa
r
ameter<op>'word'}
"
inside double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C
H
ama
n
o
t3701
:
add-p-fix makes the last test to
p
ass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remo
v
e gitweb/gitweb
.
cgi an
d
other legacy target
s
from
.
.
.
Requested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
git-in
s
tawe
b
: Simplify bui
l
d dependen
c
y o
n
gitweb
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ham
a
no
merge: make branch
.
<
na
m
e>
.
m
e
rgeopti
o
ns correctly o
v
er
r
i
d
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Br
i
t
t
o
Remove
duplic
a
t
ed "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre
R
abbeli
e
r
fa
s
t-import: fix o
p
tion parser
for no-arg options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ham
a
n
o
Merg
e
b
r
an
c
h 'js/maint-1
.
6
.
6
-
s
e
nd-pack-sta
t
eless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-p
a
ck: unbrea
k
push over stateles
s
rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio C Hamano
t3701: fix here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael J
G
ruber
gi
t
-
f
a
st
-
import
.
txt: --relative-mar
k
s takes
n
o
param
e
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
Sharov
shell: add missing i
n
i
tializa
t
ion of argv
0
_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Bri
a
n
Ge
r
n
hardt
t/annotate-te
s
ts: Use ech
o
& cat
instea
d
of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hama
n
o
G
it 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Mer
g
e branch
'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anc
h
'
sp/maint
-
c
le
a
r-postfie
l
ds'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
M
e
r
g
e b
r
anch
'j
k
/maint-
s
tash-o
o
b' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch
'jk/maint-uplo
a
d
-pack-shal
l
ow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branc
h
'dm/stas
h
-k
-
i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch 'jc/pack-objec
t
s-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge
branch 'mg/reflog-with-options' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
ma
n
o
M
e
rg
e
branch 'jk/st
a
sh-loosen-saf
e
ty' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge
b
ranch 'ar/clean-rmdi
r
-empty' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
M
erge
b
r
a
nch 'mg/sha1-path-advise' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Valenti
n
Haenel
git-add
.
t
x
t: docu
m
ent
'
ad
d
.
ignore
E
rro
r
s'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jes
s
up
Pa
s
s empt
y
fi
l
e
to p4merge where no base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Roui
l
lier
L
o
ok for password in both CVS
a
nd CV
S
NT pass
w
or
d
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
merge-one-file: fix brok
e
n merges with alter
n
ate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for m
e
rge-
i
ndex / merge-one-fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C
Hamano
"add -p": w
o
rk
-
a
roun
d
an old la
z
in
e
ss that does n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
a
dd--interactive
.
p
e
r
l: f
a
ctor out
repeated
--recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C Hamano
t3701: Edit
i
n
g
a spli
t
hunk in an
"
ad
d
-p
"
sessio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p: 'q' should r
e
al
l
y q
u
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Haman
o
Start 1
.
7
.
5
.
1 m
a
intenance
t
r
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
am
a
no
Merge br
a
nch 'mg/x-years-1
2
-months' into main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
g
it-send-ema
i
l:
f
ix
m
issing space in error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
s
h Stone
blame: t
o
lerate bogus
e
-
m
ai
l
add
r
esses a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-rebase
-
-interactive
.
sh: preserve-merges fai
l
s o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: quote rfc822 spe
c
ia
l
s in email
addresse
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n
Haenel
g
i
t
-svn
.
tx
t
: sm
a
l
l
typeface
i
mprove
m
en
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n Haenel
git-svn
.
txt
:
m
o
ve
option
d
e
s
criptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: fix usage of --add-aut
h
or-fro
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C
Ha
m
ano
http: clear POSTFIELDS when init
i
ali
z
ing a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
J
unio
C
Hamano
Merge bra
n
ch
'js/mai
n
t-1
.
6
.
6-send
-
p
a
ck-stateles
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Sixt
sen
d
-pack
:
av
o
id deadlock w
h
en pack-object dies early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
Fix "add -u
"
that some
t
imes fa
i
ls to
r
esolve u
n
merged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Haman
o
diff-files: show unmerged entri
e
s correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff: remove
o
ften
unused paramete
r
s
from d
i
f
f
_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
diff
.
c: return filepair from diff_u
n
merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
test: use
$
_z
4
0 from
tes
t
-
lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next