repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
receive-pack: eliminate duplicate .have refs
2011-05-20
Jeff King
receiv
e
-pack: elimina
t
e duplicate
.
have refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
bise
c
t: refa
c
t
o
r sha1_array int
o
a generic sha
1
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
refacto
r
refs_from
_
alternate_cb to
allow
passing e
x
t
ra
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
U
pda
t
e draft release notes
t
o 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o
C Ham
a
no
Merge bra
n
ch 'j
n
/maint-format-pat
c
h-doc'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'ss/cherry-pick-x-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'vr/merge-base
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
er
g
e bra
n
ch 'sr/
m
a
int
-
fast-import-tigh
t
en-op
t
ion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branch 'jc/t1506-she
l
l-para
m
-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch
'
j
c/fix-add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
M
erge b
r
anch
'jn/gitweb-de
p
endency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ha
m
ano
Merge branch '
j
c/maint-branch-m
e
r
geop
t
ions
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'jc/maint-add-p-overlapping-
h
unks'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
M
eyerin
g
Documen
t
at
i
on/git-fsc
k
.
txt
:
fi
x
t
y
po: u
n
r
ead
a
ble
-
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
U
p
date draft release 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 Hamano
Merge bra
n
ch '
c
n/format-patch-qu
i
et' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Ham
a
no
Merge
b
ranch '
j
m/mergetool
-
su
b
modules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Mer
g
e branch 'jk/format-patch-
q
uote-special-in-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Merge branc
h
'vh/git-svn-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Haman
o
g
i
t
_open_noa
t
ime
(
)
:
d
rop unused
para
m
eter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_file: typof
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonatha
n
Nied
e
r
add, merge
,
diff: do not use strcasecmp
t
o c
o
m
pare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Prepare for
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge
b
ranch 'aw/maint-re
b
ase-i-p
-
no
-
ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'js/b
l
ame-pars
e
n
ame
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Me
r
g
e branch 'gr/cvsimport-alternative-cv
s
pass-locatio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
a
mano
Merge branch 'cj/p
4
m
erge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
M
e
rg
e
branch
'
jk/
m
erge-one-file-wo
r
king-t
r
ee' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-d
i
ff-files-unmerged'
int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hama
n
o
Merge branch 'mz/
m
a
i
n
t
-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
o
h
a
n
Herla
n
d
t5400: Fix a couple of t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
t1507: av
o
id "
$
{parameter<op>'word'
}
" inside
d
ouble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jun
i
o C Ha
m
ano
t3701:
a
dd-p-
f
ix
makes the
last t
e
st t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
akub N
a
rebski
Remove git
w
eb/gitweb
.
c
gi a
n
d other legacy targets 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 Nar
e
bs
k
i
git-instaweb: Simp
l
ify build
dependency 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
Juni
o
C Hamano
merge: ma
k
e
branch
.
<name>
.
mergeoptions corr
e
ctly
o
ve
r
r
ide
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Br
i
tto
Re
m
ove duplicated "is
a
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverr
e
Rabbelier
fast-import
:
fix
option par
s
er f
o
r
no-ar
g
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
t3701: fix here docume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J
Grub
e
r
g
i
t-fast-import
.
txt: --relative-mar
k
s takes
no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
Sharov
shell: add missin
g
initial
i
z
a
tio
n
of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/anno
t
ate-tests
:
Use echo &
c
at instead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
mano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
ge branch
'jh
/
dirstat' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge br
a
nch 'sp/maint-cl
e
a
r
-
postfields' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hama
n
o
Mer
g
e
branch 'jk/
m
aint-
s
tash-oob' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch
'
jk
/
mai
n
t-u
p
l
oad-pack-
s
hallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Mer
g
e branch 'dm/stas
h
-k-i-p' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hamano
Mer
g
e
branch 'jc/
p
ac
k
-obje
c
ts-bigf
i
le' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C Haman
o
Merg
e
b
r
anch 'mg/reflo
g
-with
-
o
p
t
ions' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
a
m
ano
Mer
g
e bran
c
h 'jk/stash
-
loosen-safety' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge b
r
anc
h
'
a
r/
c
lean
-
rmdir-em
p
ty' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch 'mg/sha1-path
-
a
dvi
s
e' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valen
t
i
n
H
aenel
git-add
.
txt:
document 'add
.
ignoreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciar
a
n J
e
ssup
Pass empty file
t
o p4merge where no
base is suit
a
ble
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look
for password in both CVS a
n
d CV
S
NT passwo
r
d
f
iles
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge
-
one-f
i
l
e: fix broken
merges wit
h
alternate
work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
ad
d
tests for merge-index
/
m
e
r
ge-one-
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C Ha
m
ano
"ad
d
-
p": work-around an old
l
az
i
ness
t
ha
t
does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add-
-
inte
r
ac
t
ive
.
perl: factor out repeated --r
e
count
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
t3
7
01:
E
diting a split
h
unk in
an "ad
d
-p" se
s
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Ha
m
ano
add -p
:
'q
'
shoul
d
reall
y
quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io
C
Hamano
Start
1
.
7
.
5
.
1 m
a
in
t
enance
t
r
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
M
e
r
ge branch 'mg/x-years-12-months'
into
m
aint
commit
|
commitdiff
|
tree
2011-04-29
Sylva
i
n Rabot
git-send-e
m
ail: f
i
x
missing s
p
a
c
e in erro
r
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tolerate bog
u
s e
-
mail a
d
d
resses a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
An
d
rew Wong
git-re
b
a
se--i
n
teractive
.
s
h: preserve-
m
erges fails
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff
K
i
n
g
pretty:
quote
r
fc
8
22 special
s
in email addres
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Haenel
gi
t
-sv
n
.
txt: small
t
ypefac
e
impr
o
vements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Hae
n
e
l
git-svn
.
txt: mov
e
option
d
escriptio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
tx
t
: fix
u
sage
of --add-au
t
hor-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http
:
c
l
ear POSTFIELDS wh
e
n initializing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
aman
o
F
i
x
"a
d
d -u" that some
t
imes f
a
ils to
r
esolve unme
r
ged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
d
iff-f
i
les:
sh
o
w
u
n
merged en
t
ries corr
e
ctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
d
iff: remove oft
e
n unu
s
ed parameter
s
from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
ma
n
o
diff
.
c: return f
i
lepair from
d
iff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
t
es
t
:
use $_z40 from test-
l
ib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Mi
c
ha
e
l J Gruber
date: avoid
"
X years, 12 m
o
nths" i
n
relati
v
e dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ha
m
a
n
o
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sync wi
t
h 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
unio
C Hamano
G
i
t 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mich
a
el J Gruber
g
i
t-svn
.
t
xt:
Docume
n
t --me
r
geinf
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Re
v
ert "
r
un-
c
o
m
mand:
p
rettify -D_
F
ORTIFY_SOURCE w
o
rkaround"
commit
|
commitdiff
|
tree
2011-04-15
Seb
a
s
t
ia
n
Schuber
t
h
doc:
Clarify that "cherry-pick -x" do
e
s not use "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Documentatio
n
: describe the forma
t
of mess
a
ges
wi
t
h
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Restructure docu
m
entat
i
o
n for
g
it
-
merge-base
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
V
inc
e
nt va
n
Ra
v
este
i
jn
D
o
c
u
mentation:
u
pda
t
e
to git-merge-
b
ase --oct
o
pus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
J
unio C
H
amano
Merg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: document limita
t
ion of tar
.
u
m
a
s
k
c
onfig setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J G
r
uber
t3306,t5304: avoid clock s
k
ew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
git
.
txt:
f
ix list
c
o
n
t
inua
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
am
a
n
o
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
Merge branch 'jc/rev-lis
t
-
optio
n
s-
f
i
x
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Hamano
M
erg
e
bran
c
h 'js/checkout-untracked
-
symlink'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
mergetool: Teach
about s
u
bmodu
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remove doub
l
ed wo
r
ds
,
e
.
g
.
, s/to to/t
o
/
,
a
n
d fix re
l
ated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachandra
revert:
H
ide '
-
r' opti
o
n in
d
e
fau
l
t usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín
N
iet
o
for
m
at-pa
t
ch: document
-
-quiet op
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next