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
Jun
i
o C
H
ama
n
o
c
heck
o
u
t
-
f: deal with a D/F c
o
nflict e
n
tr
y
c
o
r
rectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-08
Junio C Haman
o
M
erge branch
'
c
b
/maint-fet
c
h
-
refspe
c
-wo-dst' into main
t
commit
|
commitdiff
|
tree
2009-07-08
Junio C
H
amano
Merge br
a
nch 'cf/
m
a
i
nt-
r
emote-upload
p
a
c
k-
u
seconfig
.
.
.
commit
|
commitdiff
|
tree
2009-06-30
Junio
C
Ha
m
an
o
r
e
quest-pull: real
l
y
d
i
s
able pa
g
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C Hamano
Merg
e
branch 'sb
/
m
a
i
nt-1
.
6
.
0-add-config
-
fix'
in
t
o maint
commit
|
commitdiff
|
tree
2009-06-22
Juni
o
C Haman
o
GIT 1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge branch 'ak/
m
aint-f
o
r-each-ref-no-looku
p
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hama
n
o
M
e
rge branch 'rc/main
t
-h
t
tp-local-slo
t
-
fix' i
n
to
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-06-22
Junio
C
Hamano
Merge
branch 'cb/ma
i
nt
-
no-double-merge' into ma
i
nt
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hama
n
o
Merge
b
ranch
'mn/maint-ico
n
v-autoconf' into
m
ain
t
commit
|
commitdiff
|
tree
2009-06-22
Junio
C Hamano
Merge
b
r
anch
'lt/maint-unsign
e
d-left-shift' into main
t
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge bran
c
h '
p
b
/
m
aint
-
1
.
6
.
2-userdiff-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-06-21
Junio C H
a
m
a
no
a
tt
r
ibute: whitesp
a
ce set to t
r
ue
d
etects all errors
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C
Ha
m
ano
t
3
505:
f
ix a
b
use
of test_expect_code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
M
er
g
e bra
n
ch 'maint-1
.
6
.
2'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
1' into
mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
0' in
t
o mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Junio C H
a
mano
Mer
g
e branch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-14
Junio
C
H
amano
Merge branch 'maint
-
1
.
6
.
1' int
o
maint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Ju
n
io
C Hamano
Merge b
r
anch
'maint-1
.
6
.
0' into
m
ain
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
Junio C Ham
a
no
Merge bran
c
h 'uk/ma
i
nt-1
.
5
.
3
-
rebase-i-
r
eflog' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-04
Jun
i
o C H
a
m
ano
GIT 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-03
J
u
nio C Hamano
blame:
corr
e
c
t
ly
handle a pat
h
that used to be a direc
t
ory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o
C Hama
n
o
U
pdate draft release notes for 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C H
a
ma
n
o
Merge branch 'cb/m
a
int-1
.
6
.
0-x
d
l-merge-fi
x
' into maint
commit
|
commitdiff
|
tree
2009-06-02
J
unio C H
a
mano
Merge branch 'r
s
/maint-grep-word-re
g
exp-fi
x
' in
t
o maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Me
r
ge
b
r
anch 'sb/ma
i
n
t-1
.
6
.
2-
o
pt-
f
ilenam
e
-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Ham
a
n
o
Merge
bran
c
h 'jc/maint-add-p-coalesc
e
-fix' into
m
aint
commit
|
commitdiff
|
tree
2009-06-02
Junio C
Hamano
Merge br
a
n
c
h
'
tr/ma
i
n
t
-doc-stash-pop' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Prepa
r
e fo
r
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
/maint-n
o
-ln-across
-
l
i
b
exec-and-b
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge bran
c
h 'lt/
m
a
i
nt-diff-
r
e
duce-lstat' into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o
C Hamano
Me
r
ge
b
ranch
'jm/f
o
rmat-p
a
tch-no-aut
o
-n
-
w
h
e
n
-k-
i
s
-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge bran
c
h
'do/maint-
m
e
rge-recursive-fix' into m
a
int
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
i
o
C
H
am
a
no
Me
r
ge branch '
j
k/m
a
int
-
1
.
6
.
0-trace
-
argv' into maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C
Hamano
Me
r
ge branch '
n
p/
p
ush-delta' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Ham
a
no
Merg
e
branch
'ar/merge-one-fi
l
e-di
a
g' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ha
m
ano
Merge branch 'ar/un
l
ink
-
err' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
uni
o
C Hamano
M
e
r
g
e
br
a
nch 'jk/mai
n
t-ad
d
-
empty' into maint
commit
|
commitdiff
|
tree
2009-05-24
J
u
nio C H
a
mano
Me
r
ge branch 'm
a
int-
1
.
6
.
2' into
m
a
int
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch '
m
aint-1
.
6
.
1
'
into maint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge bran
c
h
'
maint
-
1
.
6
.
0' in
t
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Junio C
H
amano
c
omplet
i
on: enhance "current
b
ranch" displ
a
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completion: simplify "
c
urrent br
a
n
ch" in __gi
t
_ps1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completion: fix PS1 display
d
urin
g
a merge on detached
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Ha
m
ano
Re
v
ert "git-add--int
e
ractive: remove
hunk
c
oales
c
ing"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Jun
i
o C Ha
m
ano
Merge
branch 'mai
n
t-1
.
6
.
2' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Merge
branch '
m
a
int-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Merge bra
n
ch
'
maint-1
.
6
.
0' into
m
aint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Juni
o
C Hamano
G
IT 1
.
6
.
3
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-12
Junio C
Hamano
Mer
g
e branch 'main
t
-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-12
Juni
o
C H
a
m
an
o
Merge branch
'
jc/m
a
int-read-tree-multi' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Haman
o
Revert "ch
e
cko
u
t branch: prime cache-tree fully
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Juni
o
C Hamano
arc
h
iv
e
-tar
.
c
:
s
q
uelc
h
a type mism
a
tch wa
r
nin
g
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 main
t
enance se
r
ies
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C
H
a
mano
Merge branch '
m
aint-1
.
6
.
1' into
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Merg
e
branch
'
m
a
int-1
.
6
.
0' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
J
u
n
io C Hamano
G
IT
1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio
C Ham
a
no
g
it-clean doc: th
e
command on
l
y affects
paths under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-05-06
Junio
C
Ham
a
n
o
Mer
g
e branc
h
'rj/maint-1
.
6
.
0-svn-parse-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-06
J
u
nio C Hamano
Merge
b
ranc
h
'maint-1
.
6
.
0' int
o
maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Sync with GIT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
i
o C Hamano
G
IT
1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
Merge branch 'np/m
a
int-no
-
o
fs-delta' into maint
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io
C Hama
n
o
Merge br
a
nch 'main
t
-1
.
6
.
1
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
GIT
1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Mer
g
e branch 'jc/
m
aint-read
-
tree
-
multi' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
amano
Merge branch 'mk/maint-apply-swap
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Merge branch 'mm/maint-add
-
p
-
q
uit' into
m
a
int
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merg
e
branch 'lt/pack
-
object-memuse' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge bra
n
ch 'jc/main
t
-
1
.
6
.
0-keep-pack' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio
C
Hamano
Merge branch 'j
c
/maint-
1
.
6
.
0-diff-borrow-care
f
ully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge bran
c
h 'bs/maint-1
.
6
.
0-tree-walk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Junio C
Ha
m
ano
GIT 1
.
6
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Junio C H
a
m
a
no
Merge git://repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2009-05-01
Juni
o
C
Ham
a
no
M
e
r
g
e
g
it:
/
/git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-04-29
Jun
i
o C
H
amano
Merge bra
n
ch
'
m
a
int'
commit
|
commitdiff
|
tree
2009-04-29
Junio C
H
a
m
an
o
merge
-
recursiv
e
: d
o
not die on
a conflicting subm
o
dule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Junio C
Hamano
Merge branch 'maint-
1
.
6
.
1
' int
o
m
aint
commit
|
commitdiff
|
tree
2009-04-29
Junio C H
a
mano
Mer
g
e branch 'maint-1
.
6
.
0' into
m
aint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio
C
H
a
mano
di
f
f -c -p: do not
die on submo
d
ules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Junio
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge branch
'maint
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
M
erge bran
c
h 'maint-1
.
6
.
0' into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
Jun
i
o C Hamano
GIT 1
.
6
.
3
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Junio C Ha
m
ano
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-04-25
Jun
i
o
C H
a
man
o
Merge branch 'maint-1
.
6
.
1' int
o
main
t
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Mer
g
e
b
ranch
'maint-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Junio C Hamano
M
a
kefile: ignore per
l
/
s
ubdir
e
ctory under
NO_PE
R
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Junio C Hamano
Merge
br
a
nch 'jc/
m
aint-read-
t
r
e
e-multi'
commit
|
commitdiff
|
tree
2009-04-21
J
u
nio C H
a
mano
Revert "stat_t
r
ac
k
in
g
_info(): only
c
ount real commits"
commit
|
commitdiff
|
tree
2009-04-21
J
u
n
io C H
a
m
a
no
Me
r
ge branch 'mk/maint-a
p
pl
y
-swap'
commit
|
commitdiff
|
tree
2009-04-21
Junio C H
a
man
o
Mer
g
e b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
ch
e
ckout
b
r
anch: p
r
ime
c
ache-tree
fu
l
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o
C
Ham
a
no
rea
d
-tr
e
e -m A B: prime
cache-tree fro
m
the swi
t
ched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
Move prime_cach
e
_tree() to cache-
t
ree
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Ju
n
io
C Hama
n
o
read-tree A
B
: do not c
o
rrupt cache-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio
C
Ha
m
a
no
Merge branc
h
'mm/maint-a
d
d-p-qu
i
t'
commit
|
commitdiff
|
tree
2009-04-20
J
u
n
io
C Hamano
Syn
c
with 1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next