repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout -f: deal with a D/F conflict entry correctly
2009-07-18
Junio C Hamano
checkout
-f: dea
l
with a D/F co
n
flic
t
entry corr
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-07-08
Junio C
Hamano
Merge branch 'cb/m
a
int-fetch-re
f
spec-
w
o-d
s
t
'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2009-07-08
Junio C Hamano
Mer
g
e
branch 'cf/maint
-
remote-uploadpack-useconfig
.
.
.
commit
|
commitdiff
|
tree
2009-06-30
J
unio C Hamano
requ
e
st-pull
:
really disabl
e
pag
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-22
Junio C
Hamano
Merge
b
ranch 'sb/mai
n
t
-
1
.
6
.
0-add-config-fix'
int
o
maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
GIT
1
.
6
.
3
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Me
r
ge branch
'
ak/maint-
f
or
-
each-
r
ef
-
n
o-lookup
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Jun
i
o C Ham
a
no
Me
r
ge
b
ranch 'rc/maint-http
-
l
o
c
al-slot-fix' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
io C Ha
m
an
o
Me
r
ge b
r
anch '
c
b/maint-no-d
o
uble-mer
g
e'
into m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ha
m
an
o
M
e
r
g
e b
r
anch 'mn/maint-iconv-autoconf' into maint
commit
|
commitdiff
|
tree
2009-06-22
Junio
C Hamano
Merge
b
ranch 'lt/maint-uns
i
gned
-
left-shif
t
' into ma
i
nt
commit
|
commitdiff
|
tree
2009-06-22
Juni
o
C
Hamano
Merge branch
'pb/maint-1
.
6
.
2-userdiff-fi
x
' into main
t
commit
|
commitdiff
|
tree
2009-06-21
Junio C H
a
mano
attrib
u
te
:
whitespace se
t
t
o true detects all errors
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
t35
0
5: fix a
b
u
s
e of t
e
st_expect_code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C
H
amano
Merge branch 'main
t
-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge branc
h
'mai
n
t-1
.
6
.
1
' into
main
t
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Junio
C Hamano
Merge bran
c
h 'main
t
-1
.
6
.
0' i
n
to mai
n
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
J
unio C Ham
a
no
Merg
e
branch
'
main
t
-
1
.
6
.
2' into
maint
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge b
r
a
n
c
h 'maint-
1
.
6
.
1' into mai
n
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Juni
o
C Hamano
M
erge branch 'maint-1
.
6
.
0
' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
Junio C Ha
m
ano
Merge branch 'uk/mai
n
t
-
1
.
5
.
3-
r
ebase-i-reflog' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-04
J
un
i
o C
H
ama
n
o
GIT 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio
C Hamano
bl
a
me: cor
r
ectl
y
handle a path that u
s
ed
t
o be a directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
U
p
date dr
a
ft release notes for
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio C
H
am
a
no
Merge branch 'c
b
/m
a
int-1
.
6
.
0-xdl-merge-fix' i
n
to
main
t
commit
|
commitdiff
|
tree
2009-06-02
Juni
o
C Hamano
Merg
e
branch 'rs/maint-grep-word
-
r
e
gexp-fix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
io C Hamano
M
erge
b
ran
c
h 'sb/
m
aint-1
.
6
.
2-opt-
f
ilename-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
io C Hamano
Merg
e
branch 'jc/maint-add-p-coales
c
e-
f
ix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C H
a
mano
Merge bra
n
ch 't
r
/maint
-
doc-sta
s
h-pop' into
maint
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
Pr
e
pare
for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge b
r
anch 'js/maint-no-
l
n-ac
r
os
s
-
l
ibe
x
ec-and-b
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C H
a
mano
Merge
b
ranch
'lt/maint-di
f
f-r
e
duce-
l
stat'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C Hamano
Merge b
r
anc
h
'j
m
/format-pa
t
ch-no-auto-n
-
when-k
-
is-g
i
v
e
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
a
m
ano
Merge branch 'do/m
a
i
nt-merge-recursive-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
unio C H
a
mano
Merg
e
branch
'
j
k/mai
n
t-1
.
6
.
0
-t
r
ace-argv' into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Hamano
Merge branch 'np/p
u
sh
-
de
l
ta' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Merge branch 'ar/
m
e
r
ge-one-f
i
le-di
a
g' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
M
e
rge
b
r
a
nch 'ar/unlin
k
-err
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Merge branch 'jk/maint-add
-
empty' into maint
commit
|
commitdiff
|
tree
2009-05-24
Jun
i
o C Hamano
Merge branch
'maint-1
.
6
.
2' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-24
J
u
nio C H
a
mano
Merge br
a
nch '
m
ain
t
-
1
.
6
.
1' into
m
aint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
J
u
n
io C Hamano
Me
r
g
e
br
a
nch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C Hamano
completion: enhance "curre
n
t branch" d
i
splay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Haman
o
comp
l
e
t
io
n
:
simp
l
ify "current branch"
i
n
__git
_
p
s
1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Ham
a
no
c
omple
t
ion: fix PS1 display durin
g
a
m
erge on deta
c
he
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
u
nio C
Hamano
R
e
v
e
r
t
"git-add--interactive: remove hunk
c
oalescing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Junio C
H
a
mano
M
e
rge branc
h
'mai
n
t-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-14
J
u
ni
o
C H
a
man
o
Me
r
ge branch 'maint-1
.
6
.
1' into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C
Hamano
Merge branch 'maint-1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Jun
i
o C
H
aman
o
GIT 1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Ju
n
io
C
Hamano
Merge branch '
m
a
i
nt-1
.
6
.
2' in
t
o
m
a
in
t
commit
|
commitdiff
|
tree
2009-05-12
Juni
o
C
Hamano
Merge branch 'jc/maint-read-tree-multi' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C H
a
ma
n
o
Revert "checkout branc
h
: prime cache-tr
e
e fully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
archive-tar
.
c: squelch
a ty
p
e mis
m
atch warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Haman
o
Start 1
.
6
.
3
.
1 m
a
in
t
enance se
r
ies
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Ha
m
ano
M
e
r
g
e branch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Ju
n
io C Hama
n
o
Merg
e
b
r
anch 'maint-1
.
6
.
0' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio C
Hamano
GIT 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio
C Hama
n
o
g
i
t
-
c
l
e
a
n
doc: the c
o
mm
a
n
d
only affec
t
s paths under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio
C H
a
mano
Merg
e
b
r
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2009-05-06
Jun
i
o C Hamano
Merge branch 'rj/maint-1
.
6
.
0-
s
vn
-
parse-fix' int
o
main
t
commit
|
commitdiff
|
tree
2009-05-06
J
u
n
i
o C H
a
ma
n
o
Merge branch 'maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
Sync
w
i
th
G
IT
1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
GIT 1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
Merge b
r
anch 'np/maint-no
-
ofs-delta' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
e
rge
b
r
anch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C
Ha
m
ano
GIT 1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
amano
Merge branch 'jc/maint
-
read-tre
e
-
m
ulti' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C
H
a
m
ano
Merg
e
b
ranch 'mk/maint-appl
y
-swap' in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
erg
e
bran
c
h '
m
m/mai
n
t-add-p-quit' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ha
m
ano
Mer
g
e br
a
nch 'l
t
/pack-object-memuse' i
n
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C
Hamano
Merge branch 'jc/maint
-
1
.
6
.
0-keep-pack' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
e
rge br
a
n
c
h 'jc/maint
-
1
.
6
.
0-d
i
ff-b
o
rrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
ama
n
o
M
erge b
r
an
c
h 'bs
/
maint-1
.
6
.
0-tree-walk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Junio C Hamano
G
IT 1
.
6
.
3-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Ju
n
io
C
H
a
mano
Merge git://
r
epo
.
o
r
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2009-05-01
J
unio C Hamano
M
erge git://git
.
k
e
rnel
.
org/pub/scm
/
gi
t
k/
g
itk
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2009-04-29
Juni
o
C Hamano
merge-recursive:
do not
d
ie on a con
f
licti
n
g su
b
modu
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio
C H
a
mano
Merge
b
ranch
'
maint-1
.
6
.
1'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ham
a
no
Mer
g
e
b
ra
n
c
h
'maint-1
.
6
.
0' into
ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
J
u
nio C
H
amano
di
f
f
-c -p: do
n
ot die o
n
submodule
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Juni
o
C Ham
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-04-28
Ju
n
io C Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into
maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
Ju
n
io C Hamano
GIT 1
.
6
.
3-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Ju
n
io C Hamano
M
e
rge b
r
anch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-04-25
Junio
C Hamano
Merg
e
bra
n
ch
'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-25
Ju
n
io C Hamano
Mer
g
e
branch 'maint-1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Junio C Hamano
Make
f
ile:
i
g
n
or
e
p
erl
/
subdirectory under NO_PE
R
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Junio C Hamano
Merge b
r
anc
h
'jc/maint-read-tree-multi'
commit
|
commitdiff
|
tree
2009-04-21
J
u
n
io C Ham
a
no
Revert "st
a
t_tracking_in
f
o(): o
n
l
y
cou
n
t real commits
"
commit
|
commitdiff
|
tree
2009-04-21
Junio
C
Ha
m
a
n
o
Merge branch 'mk
/
maint-apply-swap'
commit
|
commitdiff
|
tree
2009-04-21
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
checkout bran
c
h: prime c
a
c
h
e-tree fully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
Hamano
read-tre
e
-m A
B: p
r
im
e
c
ache
-
tree fro
m
the swit
c
hed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C
Hamano
Move
p
rime_cache_tree() to cac
h
e-tree
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hama
n
o
read-tr
e
e A B: do
n
ot c
o
rrupt
cache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
M
e
r
g
e br
a
nc
h
'mm/mai
n
t-add-p
-
quit'
commit
|
commitdiff
|
tree
2009-04-20
J
un
i
o
C Hamano
Sync with 1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next