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
out -f: dea
l
wit
h
a D/F conflict en
t
ry
cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-07-08
J
u
nio C Hamano
M
e
rge branch
'cb/mai
n
t-fetch-refspec-wo-ds
t
' int
o
maint
commit
|
commitdiff
|
tree
2009-07-08
Junio C Haman
o
Merg
e
branch
'cf/maint-remote-uploadpac
k
-
u
seconfig
.
.
.
commit
|
commitdiff
|
tree
2009-06-30
Junio C Hamano
reque
s
t
-
pull: really disa
b
l
e pa
g
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-22
Juni
o
C
Hamano
Merge branch
'sb/maint
-
1
.
6
.
0-add
-
config-fix' into maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ham
a
n
o
GIT 1
.
6
.
3
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C Hamano
M
erge branch 'ak/main
t
-for-each-ref-no-l
o
okup' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge
branch 'rc/maint-http-local-slot
-
fix' in
t
o
maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ham
a
no
Me
r
g
e br
a
nch 'cb/maint-no-doub
l
e-
m
erge
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ham
a
no
Me
r
g
e
branch 'mn/maint-iconv-autoc
o
n
f
'
int
o
maint
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
io C Ham
a
no
Merg
e
branch 'lt/maint-uns
i
g
ned-
l
eft
-
shift' into maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
M
e
rge br
a
nch 'p
b
/maint-1
.
6
.
2-userdiff-fix' into maint
commit
|
commitdiff
|
tree
2009-06-21
J
u
n
io
C
H
amano
attribute: whi
t
espace
s
et to true de
t
ects all errors
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio
C
H
am
a
no
t3505: fix abuse of test_expect_code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C H
a
m
a
no
M
e
rge
branch
'
m
a
in
t
-
1
.
6
.
2'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C Hamano
Mer
g
e
branch 'main
t
-
1
.
6
.
1' int
o
ma
i
nt-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge branch
'maint-1
.
6
.
0' into main
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge
br
a
nch 'main
t
-1
.
6
.
2' into mai
n
t
commit
|
commitdiff
|
tree
2009-06-14
Juni
o
C
H
am
a
no
Merge branch 'maint
-
1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge
b
r
anc
h
'ma
i
nt-1
.
6
.
0'
i
n
to maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
Ju
n
i
o
C
H
amano
Merge branch
'uk/maint
-
1
.
5
.
3-
r
eb
a
se-i-reflog' into
.
.
.
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
Ju
n
io C H
a
mano
bla
m
e: corr
e
ctly h
a
ndle a path
t
h
at used to
b
e a d
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
io C Hamano
U
p
da
t
e draft release notes for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
J
u
nio C
Hamano
Merge br
a
nch 'cb/maint-1
.
6
.
0-xdl
-
merge-fix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hama
n
o
Merge
br
a
nch 'rs/maint-gr
e
p-
w
or
d
-re
g
e
xp-fix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
io C
H
amano
Mer
g
e branc
h
'sb
/
maint-1
.
6
.
2-opt-filen
a
me-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
J
unio C Hama
n
o
Merge b
r
anch 'jc/maint-add
-
p
-coa
l
esce-fix' into
m
ain
t
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
M
erge branch 'tr/ma
i
nt
-
doc-stash-pop' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
H
amano
Prepare for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Haman
o
Merge branc
h
'js/maint-
n
o-ln-across-libe
x
ec-and-
b
in
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'lt/maint-diff-reduce-
l
stat' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
a
mano
M
erge bran
c
h '
j
m
/format-patch-no-auto-n-when-k
-
is-gi
v
en
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge
b
ranch
'
d
o
/main
t
-
m
erge-rec
u
rsive-fix' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
i
o
C H
a
mano
Me
r
ge
b
ranch 'jk/maint-1
.
6
.
0-trace-ar
g
v' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merg
e
b
r
anch
'
np/push-delta' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge br
a
nc
h
'ar
/
mer
g
e-one-file-diag' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge br
a
nch '
a
r/unl
i
nk-err' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge
branch 'jk
/
m
a
i
nt-add-empty
'
into maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
M
e
r
g
e
b
r
anch 'maint-1
.
6
.
2
'
int
o
main
t
commit
|
commitdiff
|
tree
2009-05-24
Junio C Ha
m
ano
Merge
b
ranch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C Haman
o
Mer
g
e b
r
anc
h
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
co
m
pletion:
e
nhance "current
b
r
an
c
h"
display
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
Hamano
completio
n
: simplify "curren
t
br
a
n
ch" in __
g
it_ps1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
u
ni
o
C Ham
a
no
completion: fix PS1 display during a merge on detached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
u
ni
o
C Hamano
Revert "git-
a
dd--inte
r
active: remove hunk coale
s
cing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Jun
i
o C Hamano
Merge branch 'maint-1
.
6
.
2' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-14
J
unio C
H
a
mano
M
e
rge branc
h
'
m
aint-
1
.
6
.
1' into m
a
i
n
t-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio
C Hamano
Mer
g
e branch 'maint-
1
.
6
.
0' int
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Junio C Ha
m
ano
G
I
T
1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Junio C Haman
o
Merge
b
ran
c
h 'maint-1
.
6
.
2
' into
main
t
commit
|
commitdiff
|
tree
2009-05-12
Ju
n
io
C Hamano
Merge
b
r
anc
h
'jc
/
m
ain
t
-
r
ead-tr
e
e-multi' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Revert "checkou
t
bran
c
h: p
r
ime
c
a
c
he-tre
e
f
u
l
ly"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
arc
h
i
v
e
-ta
r
.
c: s
q
uel
c
h
a type mismat
c
h warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Start 1
.
6
.
3
.
1 maintenanc
e
s
e
r
i
es
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Merge br
a
nch 'm
a
i
nt-1
.
6
.
1
'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Jun
i
o C Hamano
Mer
g
e branch
'mai
n
t-1
.
6
.
0' into
m
ain
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio C Hamano
G
I
T
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Jun
i
o C Hamano
g
i
t-clean doc
:
the command only aff
e
cts 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
Hamano
Merge bran
c
h
'r
j
/maint-1
.
6
.
0
-
sv
n
-p
a
rse-fix' into maint
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
Sync with GIT 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
J
uni
o
C Hamano
Merge bra
n
ch 'np/maint
-
no-o
f
s-delt
a
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
n
i
o C Hamano
Me
r
ge branch 'maint-1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
GIT 1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
M
e
rg
e
b
r
an
c
h
'jc/m
a
int-read-tree-mu
l
ti' into maint
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C
Haman
o
Merge branch
'
mk/ma
i
nt-a
p
ply-s
w
ap
'
into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merg
e
branch 'm
m
/ma
i
nt-add-p-quit'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio
C Hamano
M
erg
e
b
ranch 'lt/p
a
ck-object-memuse' into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Merg
e
br
a
nch 'jc/ma
i
nt-1
.
6
.
0-keep-pack' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge
b
ranch 'jc/main
t
-1
.
6
.
0-diff-b
o
r
r
ow-ca
r
eful
l
y
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
Merge branch 'bs/
m
aint-1
.
6
.
0-
t
ree-walk-prefi
x
'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Juni
o
C
H
amano
GIT 1
.
6
.
3-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Junio C Hama
n
o
Merge g
i
t://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-05-01
Junio
C Hamano
Merge g
i
t://git
.
kerne
l
.
org
/
pub/s
c
m/
g
i
t
k
/gitk
commit
|
commitdiff
|
tree
2009-04-29
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-29
Junio
C Ham
a
no
merge-recu
r
s
i
v
e: do no
t
d
ie on a confli
c
t
i
ng submo
d
ule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merge branch 'mai
n
t-1
.
6
.
1'
into
m
aint
commit
|
commitdiff
|
tree
2009-04-29
Junio C
Hamano
M
erge
b
ranch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
diff
-c -p: do
n
ot die
on sub
m
odule
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Juni
o
C H
a
m
ano
Merge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
M
e
rge
b
r
anch '
m
a
int-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-28
Ju
n
io
C Hamano
Merge branch
'maint-1
.
6
.
0' into m
a
int
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
Junio C Ha
m
ano
G
IT 1
.
6
.
3-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
J
u
nio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-04-25
J
unio C Hamano
M
e
rge branch 'maint-1
.
6
.
1' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Me
r
ge
b
ra
n
ch 'maint-1
.
6
.
0'
i
n
to m
a
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
J
un
i
o C
Hamano
Makef
i
le: ignore perl/ subdirectory under NO_PERL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Junio C
H
a
mano
Merge branc
h
'
j
c/main
t
-read-tree-multi'
commit
|
commitdiff
|
tree
2009-04-21
Junio
C Hama
n
o
Rever
t
"stat_
t
racking_in
f
o():
only
count real
c
ommit
s
"
commit
|
commitdiff
|
tree
2009-04-21
Juni
o
C Hamano
Merg
e
branc
h
'mk/ma
i
n
t-
a
p
p
l
y-swap'
commit
|
commitdiff
|
tree
2009-04-21
Junio C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-04-20
Junio C H
a
mano
checkout branch: prime cache-t
r
ee fu
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio C Haman
o
r
ead-tree
-
m A B: p
r
ime cache-tr
e
e
from the
s
witch
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C H
a
mano
M
o
ve prime_cac
h
e
_tree() to cache-tree
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Ju
n
io C Hamano
r
ead-t
r
ee A B
:
do not corrupt c
a
che-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o
C
Hamano
Merge b
r
anc
h
'mm/
m
aint-add-p-quit'
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio C Ha
m
a
n
o
Sync
w
it
h
1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next