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
chec
k
o
ut -f: dea
l
with
a
D/F confl
i
c
t ent
r
y
corre
c
tl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-08
Junio
C H
a
m
a
n
o
Me
r
ge branch '
c
b/maint-
f
e
t
c
h
-
r
efspec
-
wo
-
ds
t
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-07-08
Ju
n
io C Hama
n
o
Merge b
r
anch 'cf/ma
i
nt-remote
-
u
ploadp
a
ck
-
u
seconfig
.
.
.
commit
|
commitdiff
|
tree
2009-06-30
Junio C Hamano
request-
p
ull: r
e
all
y
d
isable pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Mer
g
e
branch 'sb
/
maint
-
1
.
6
.
0
-
add-config-f
i
x' in
t
o maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C
H
amano
GIT 1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
io C
Hama
n
o
Merge bra
n
ch 'ak/
m
aint-
f
or-each-ref-no-lookup' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ha
m
ano
Mer
g
e branch '
r
c
/
maint-http-local-slot-fi
x
' into
m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Jun
i
o
C
Hamano
Merge branch 'cb/maint
-
no-d
o
uble-merge' into maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C
H
a
m
ano
Merge branch
'
mn/maint-
i
conv-autocon
f
' into maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ham
a
no
Merge branch 'lt/maint-unsi
g
n
ed-left-shift' into maint
commit
|
commitdiff
|
tree
2009-06-22
Jun
i
o
C Hamano
Merge b
r
a
n
c
h '
p
b/m
a
i
n
t-
1
.
6
.
2
-us
e
rd
i
ff-fix'
i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C Hamano
att
r
ibute: whitespace set to true detects all e
r
ro
r
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Ha
m
ano
t3505:
f
ix abuse
of test_
e
xp
e
ct
_
c
ode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C Ha
m
ano
M
erge branch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C
Ham
a
no
Merge branch
'mai
n
t-1
.
6
.
1' into maint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Junio
C Ha
m
ano
Merge branch
'
maint-1
.
6
.
0
'
into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Jun
i
o
C Hamano
Merge branch 'm
a
int-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-14
Jun
i
o C Haman
o
Mer
g
e
branch 'maint-1
.
6
.
1' into main
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Junio
C
H
amano
Merge
branch 'mai
n
t-1
.
6
.
0' i
n
to m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
Junio C Hamano
Me
r
ge bran
c
h 'uk/maint-1
.
5
.
3
-reb
a
se-i-ref
l
o
g
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-04
Junio
C
Hamano
GIT 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-03
J
u
nio C Ha
m
ano
blame
:
corr
e
ctly ha
n
dle
a path th
a
t u
s
e
d
t
o be a d
i
r
ecto
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ha
m
a
n
o
U
p
date draft release notes for 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge branch 'cb/maint-1
.
6
.
0-xdl-merge-fix'
into mai
n
t
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ha
m
ano
Merge br
a
n
ch 'rs
/
ma
i
nt-grep
-
word-regexp-fix' in
t
o
maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Haman
o
Merge br
a
n
c
h 'sb/
m
ai
n
t-1
.
6
.
2-opt-filen
a
me-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
J
u
n
i
o C
H
a
m
a
no
Me
r
ge branch 'jc/maint-add-p-coale
s
ce-fi
x
' into m
a
in
t
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Hamano
Merge branch 'tr/maint-doc-stas
h
-pop' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Prepare for
1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'j
s
/main
t
-
n
o-ln-across-libexec-and-
b
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Ha
m
a
no
M
e
rge branch 'lt/ma
i
nt-diff-
r
educe-lstat
'
into maint
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio
C
Hama
n
o
M
erge branch 'jm/form
a
t
-
patch-
n
o-
a
u
to
-
n-when-k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
J
u
n
io C Hamano
Merge
b
ranch 'do/
m
aint
-
m
e
rge
-
recursive-
f
ix' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
H
amano
Merge br
a
n
ch 'jk/mai
n
t-1
.
6
.
0
-
trace-argv'
into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge bra
n
c
h
'np/push-d
e
lta' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge
b
r
anch 'ar/merge-
o
ne-file-diag'
i
n
to main
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merg
e
branch 'ar/unlink-
e
rr' into maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C
Hamano
Mer
g
e branch 'jk/maint-add-e
m
p
t
y
' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch 'ma
i
nt
-
1
.
6
.
2
' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-24
Junio C Haman
o
M
e
rge branch
'maint-1
.
6
.
1' in
t
o
maint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C
H
a
m
ano
Merge
b
ranch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Junio C Ham
a
no
co
m
p
l
eti
o
n
: enhance
"
c
u
rrent br
a
nch" d
i
sp
l
ay
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
complet
i
on: simplify "curr
e
n
t
branch" in
__git_
p
s1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Ha
m
ano
completion:
fi
x
PS1 displa
y
d
uring a mer
g
e on detached
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C Ha
m
ano
Reve
r
t "git-
a
dd--i
n
teractive
:
remove hunk coal
e
scing"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Hamano
Merge branch 'mai
n
t-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-14
Ju
n
io C Hamano
Me
r
ge
branch 'maint-1
.
6
.
1' int
o
m
aint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
J
unio C Hamano
Me
r
ge branch 'maint-
1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Ju
n
i
o C Hamano
GIT 1
.
6
.
3
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-12
Junio C Ha
m
ano
Merge branch 'maint-1
.
6
.
2
'
into
maint
commit
|
commitdiff
|
tree
2009-05-12
Junio
C Hamano
Merge branch '
j
c/mai
n
t-read-tree-multi'
into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
J
u
n
i
o
C Hamano
Rever
t
"
c
heckout branch: prime
cache-t
r
ee fully"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Ham
a
n
o
arch
i
ve-tar
.
c: sque
l
c
h a t
y
pe
mismatch war
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Haman
o
St
a
rt
1
.
6
.
3
.
1 ma
i
n
t
enance series
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C Hamano
M
erge branc
h
'm
a
int-1
.
6
.
1
'
into main
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
M
e
rge branch 'ma
i
nt
-
1
.
6
.
0' int
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio C H
a
mano
GIT 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio
C Hamano
g
i
t-clean doc: the comman
d
o
n
ly a
f
fects paths und
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
J
u
n
io C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-05-06
Junio C Haman
o
Merge branch 'r
j
/
m
aint-1
.
6
.
0-svn-parse-fix
'
into maint
commit
|
commitdiff
|
tree
2009-05-06
Junio C Ham
a
no
Merge branch 'm
a
int-1
.
6
.
0'
into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Hamano
Sync with
G
IT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hama
n
o
GIT 1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
J
unio
C
Hamano
Merg
e
bran
c
h
'
np/mai
n
t-no-o
f
s-delta'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io
C
Hamano
Merge branch 'maint-1
.
6
.
1
' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hama
n
o
GI
T
1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
Me
r
ge
branc
h
'jc/maint-
r
ea
d
-
tree-mu
l
ti' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C
H
a
mano
Merge br
a
nch 'mk/
m
aint-apply-sw
a
p'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
erge branch
'mm/maint-add-p-
q
uit
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ha
m
a
no
M
erge branch 'lt/pack-ob
j
e
c
t-memuse' into
maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C H
a
mano
Merge branch 'jc/maint-
1
.
6
.
0
-
keep
-
pack' into
main
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Hamano
Merge branch 'jc/maint-1
.
6
.
0-diff-borrow-carefull
y
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio C H
a
mano
Merge
branch 'bs/maint-1
.
6
.
0-tree
-
wa
l
k-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
J
unio C Hamano
GIT 1
.
6
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Juni
o
C H
a
mano
Merge git://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2009-05-01
Junio C Ha
m
ano
Merge g
i
t://gi
t
.
ker
n
el
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-04-29
Juni
o
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-29
Junio
C
H
a
man
o
mer
g
e-recursive: do not die
on
a
c
o
nf
l
icti
n
g submodule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Junio
C
Haman
o
Merge
b
ranch
'
m
a
int-1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-29
Juni
o
C Hama
n
o
Me
r
g
e
branch 'maint-1
.
6
.
0' i
n
t
o maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
J
u
nio C Hama
n
o
diff -c -p: do
not die on submodule
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-28
Juni
o
C
Hama
n
o
M
e
rge branch
'
maint-1
.
6
.
1'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Ha
m
ano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
Junio
C
Hamano
GIT 1
.
6
.
3-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Juni
o
C
Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-04-25
Jun
i
o C Ham
a
no
Mer
g
e br
a
n
c
h 'main
t
-1
.
6
.
1
'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-04-25
Junio C
H
amano
Merge br
a
nch 'main
t
-1
.
6
.
0' int
o
maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Ju
n
io C Hamano
M
akefi
l
e
: ignore
perl/ subdirectory
un
d
er NO_PERL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Junio
C Hamano
Merge b
r
anc
h
'jc/main
t
-read-tree-multi'
commit
|
commitdiff
|
tree
2009-04-21
Junio C Hamano
Revert "stat_t
r
acking_info
(
):
o
nly c
o
unt real commits"
commit
|
commitdiff
|
tree
2009-04-21
J
u
nio C
H
amano
Merge
branch 'mk
/
m
a
int-apply-swap
'
commit
|
commitdiff
|
tree
2009-04-21
Junio C Hamano
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio C Hamano
checkout branch: pri
m
e cache-tre
e
full
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
read-tr
e
e -m A
B: prime cach
e
-tree
f
rom t
h
e switched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
Mov
e
prime_c
a
che_tree(
)
to cache-tree
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
read-tree A B: do
n
ot corrupt cache-t
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o C Hamano
Merge
br
a
nch 'mm/ma
i
nt-add
-
p-quit'
commit
|
commitdiff
|
tree
2009-04-20
Ju
n
io C Hamano
Sy
n
c with 1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next