repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint
2011-05-26
Junio C Hamano
M
erge branch 'js
/
maint-send-pack-s
t
ateless
-
r
p
c-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
H
amano
Me
r
ge branch
'svn-fe
-
maint
'
of git://repo
.
o
r
.
cz/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
N
g
u
yen Thai Ngoc Duy
ini
t
/
c
lone: remove short option -L
a
nd document --separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J
G
r
uber
git-svn: Fix git
s
vn l
o
g -
-
show-commi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
a
m
ano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
provide a copy of the LGPL
v
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merg
e
b
r
anch 'js/maint-1
.
6
.
6-
s
e
n
d-p
a
ck-
s
ta
t
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
an
o
U
pdate draft
r
elease not
e
s
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
a
no
Merge b
r
a
nch
'
jn/
m
aint-format-patch-d
o
c'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch 'ss/cherry
-
pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
anch 'v
r
/merge
-
bas
e
-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
Hamano
Merge br
a
nc
h
'
s
r
/maint-f
a
s
t
-imp
o
rt-ti
g
ht
e
n-opti
o
n
-
pa
r
sing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merg
e
b
r
anch 'jc/t
1
506-s
h
ell-param-exp
a
nsion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge bran
c
h 'jc
/
f
i
x-add-u-un
m
e
r
ged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C H
a
ma
n
o
Merge b
r
anch '
j
n/git
w
eb-depende
n
cy' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
b
r
an
c
h
'
jc/
m
aint-bra
n
ch
-
mer
g
eoptions' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Mer
g
e branch 'jc
/
maint-a
d
d
-
p-ov
e
rlapping-h
u
nks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
Meyerin
g
Documentation/git-fsck
.
t
x
t: fix typo
:
u
nread
a
b
le -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Haman
o
sideb
a
nd_demux(): fix dec
l
-af
t
e
r-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
mano
Update d
r
a
ft
r
ele
a
se notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Hamano
M
e
r
ge branch 'cn/format-p
a
t
c
h-quiet'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge
bra
n
c
h 'jm/mergeto
o
l
-
s
u
bmodu
l
es' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branc
h
'
j
k/form
a
t-patch-quote-special-in-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
M
e
rge bran
c
h 'vh/gi
t
-svn-doc
'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C
H
am
a
n
o
git_
o
pen_noatime(): drop u
n
used
p
aramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_file: t
y
pof
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Ni
e
d
e
r
add, merge,
diff: do
not use strcasecmp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C H
a
mano
Pr
e
pare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
H
amano
Merge br
a
n
ch
'
a
w
/maint-rebase-i-p-no-ff' in
t
o m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Haman
o
Me
r
ge branch 'js/blame
-
parsename
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
erge b
r
anch 'gr/cvsimpor
t
-alternat
i
ve-
c
vsp
a
ss-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
a
m
a
no
M
e
rge branch
'
c
j/p4merg
e
' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Haman
o
Mer
g
e branch 'jk/merge-one-file-working-tree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'jc/fix-diff
-
files-unmerged'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Me
r
ge br
a
n
ch 'mz/m
a
i
n
t-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Herland
t54
0
0: Fix a
couple of t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507: avoid "${p
a
ram
e
ter<op>'word'}
"
i
n
side double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701
:
add-p-fix makes the
l
ast
t
est to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jak
u
b
Narebski
Remov
e
gitweb/gitw
e
b
.
cgi a
n
d
othe
r
lega
c
y t
a
rgets
f
rom
.
.
.
Requested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Nareb
s
ki
git
-
i
nstaweb: Simpl
i
f
y
b
ui
l
d depende
n
cy on gitw
e
b
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
n
o
merge: make branc
h
.
<name>
.
mergeo
p
ti
o
ns c
o
rrectly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
o
ã
o Britto
Rem
o
ve dupl
i
c
ated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre R
a
bbel
i
er
fas
t
-imp
o
rt: fi
x
opt
i
o
n
p
arser for no-arg
optio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C H
a
mano
Mer
g
e branch 'js/maint-
1
.
6
.
6-send-p
a
ck-
s
tat
e
less
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Je
f
f King
send-pack: unb
r
eak push o
v
er
s
tatel
e
ss r
p
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Ha
m
ano
t
3
701: fix
h
er
e
do
c
ument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fast-im
p
ort
.
t
x
t: --relative-marks takes no para
m
e
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
Sharov
shell: add mis
s
ing initializati
o
n
of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian
Gernhar
d
t
t/anno
t
ate-te
s
ts:
U
se echo
&
cat
instead of
s
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
no
Merge b
r
a
nch 'jh/dirstat' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Merge branch
'
sp/maint-cl
e
ar-post
f
ields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branc
h
'jk
/
maint
-
st
a
s
h
-oob'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merg
e
bra
n
ch 'jk/maint-upl
o
ad-p
a
ck-sha
l
low' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
Hamano
M
erge branch 'dm/stash-k-i
-
p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
b
ranch 'jc/p
a
ck-objects-bigfile' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge b
r
a
nch 'mg/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
aman
o
Merge bran
c
h 'j
k
/s
t
ash-loosen-safety' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branc
h
'ar
/
clean-
r
mdir-
e
mpty'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C H
a
ma
n
o
Merge
b
ranch 'mg/sha1-p
a
th-ad
v
i
s
e' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Vale
n
tin Haenel
git-add
.
tx
t
: docu
m
ent 'ad
d
.
i
g
noreErro
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 Jessup
Pas
s
empty fil
e
to p4m
e
rge where no base is suitab
l
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouill
i
e
r
Lo
o
k
f
or passwo
r
d in
both CVS and CVSNT password f
i
les
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
me
r
ge-one-file: fix
b
roken
m
e
rges with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
ing
add tests for merge-index / merge
-
one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p": work-around
an old laziness that d
o
e
s not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
add--in
t
eractiv
e
.
pe
r
l:
f
actor out repeated --
r
ecount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
t3701: Ed
i
ting a split
h
unk in
a
n "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C Hamano
ad
d
-p:
'q' shou
l
d really qui
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hama
n
o
St
a
rt 1
.
7
.
5
.
1
maintenance tr
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hama
n
o
Merge bran
c
h 'mg/x-years-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sy
l
va
i
n Ra
b
ot
git
-
s
en
d
-email: fix m
i
ssing space in error mes
s
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
osh Stone
b
l
am
e
: tolerate
b
ogus e-mail addresses a bi
t
b
etter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-rebase-
-
in
t
eractive
.
sh:
p
re
s
erve-merges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jef
f
King
p
r
e
t
t
y: quote rfc8
2
2 specia
l
s in email addr
e
sses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin H
a
enel
git-
s
vn
.
txt
:
sm
a
ll typeface improv
e
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
i
n
Ha
e
nel
git
-
sv
n
.
t
xt:
m
ov
e
option descriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
t
i
n Haenel
git-svn
.
txt: fix usage of --add-author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Hamano
http: clear P
O
STFIELDS when in
i
tializing a
s
l
o
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
J
u
n
i
o C H
a
ma
n
o
Merge branch 'js/
m
aint-1
.
6
.
6-send-pack-stateles
s
-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes
Sixt
send-pack
:
avo
i
d deadlock when
pack-
o
bje
c
t dies early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
Fix
"add -u"
that sometimes fails to resolve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
amano
diff-
f
iles
:
show unmerged entries cor
r
ectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Hamano
diff: remove often
unused param
e
ters from d
i
ff_unm
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff
.
c: return filepair
fro
m
diff_unmer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Ha
m
ano
test: us
e
$
_
z40 from te
s
t-
l
i
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date:
a
void "X years,
12 months"
in r
e
lative dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
i
o
C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o
C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Haman
o
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
hae
l
J Gruber
git-svn
.
tx
t
: Do
c
ument -
-
m
ergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Revert "ru
n
-
c
ommand: pre
t
t
i
fy -D_FO
R
T
I
F
Y_SOURCE
workaround"
commit
|
commitdiff
|
tree
2011-04-15
Se
b
astian Schubert
h
doc:
Clari
f
y that
"
cherry-pick -x"
d
oe
s
not us
e
"git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonatha
n
Nieder
Documentati
o
n: describe the
f
ormat
o
f messag
e
s with
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Ni
e
der
Res
t
ruct
u
re documentation for
g
i
t-merge-b
a
s
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Vincen
t
va
n
R
avesteijn
Do
c
umentation: u
p
da
t
e
t
o git-merge
-
base -
-
octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
Ham
a
no
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-14
R
ené Sch
a
r
f
e
a
rchive
:
document limitation of tar
.
u
m
a
sk config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J
G
ruber
t
3
3
06,t5304: avoid clock skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next