repo.or.cz
/
git
/
git-svn.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 Hama
n
o
checkout -f: deal with
a D/
F
con
f
lic
t
e
n
try correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-08
Junio C H
a
mano
Merge
b
ranch 'cb/maint-fetch-refspe
c
-wo-dst' into maint
commit
|
commitdiff
|
tree
2009-07-08
J
unio C Ham
a
no
M
e
r
ge branch
'cf/maint-
r
emote-uploadpack-
u
sec
o
nfig
.
.
.
commit
|
commitdiff
|
tree
2009-06-30
Junio C Hamano
reque
s
t-pu
l
l: really disable pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Mer
g
e
branc
h
'sb/maint-
1
.
6
.
0-a
d
d
-
config
-
fix'
into maint
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
io C Hamano
GIT 1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Jun
i
o
C
H
ama
n
o
Merge
branc
h
'ak/m
a
int-for-ea
c
h-ref-no-loo
k
up' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
io C Hamano
Merge branch 'rc/maint-http-l
o
cal-slot-fix'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-06-22
J
unio C
Hama
n
o
Merge bra
n
ch
'
c
b
/
ma
i
n
t
-no
-
d
o
u
ble-merge' into m
a
int
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C Hamano
Merge bra
n
ch
'
mn/maint-iconv-autoconf' into
m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge
b
r
a
nc
h
'lt/maint-unsigned
-
left-shift' into mai
n
t
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
M
erge
b
ra
n
ch 'p
b
/maint-1
.
6
.
2-userdiff-fix'
into maint
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C
Hamano
attribute:
wh
i
tespace se
t
to true
detec
t
s a
l
l
e
rr
o
rs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C H
a
mano
t3505:
fix abuse of test_exp
e
ct_code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Haman
o
M
erge branch 'main
t
-1
.
6
.
2
' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C Haman
o
Merge branch 'main
t
-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C Hama
n
o
Merge branch 'mai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge br
a
nch
'
maint-1
.
6
.
2' into
maint
commit
|
commitdiff
|
tree
2009-06-14
Junio C H
a
mano
Merge branch
'
maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
J
u
n
i
o
C
H
aman
o
Merge branch 'maint-1
.
6
.
0' i
n
to
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
Junio C Haman
o
Merge
bran
c
h 'uk/mai
n
t-1
.
5
.
3-rebase-i
-
r
eflo
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-04
Ju
n
io C
H
amano
GIT
1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-03
Junio C
Hamano
b
lame:
c
orrectly handle a pa
t
h that used to be a dir
e
ct
o
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Update draf
t
rel
e
as
e
not
e
s for 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Hamano
M
e
rge branch '
c
b/m
a
int-1
.
6
.
0-xdl-merge-fix' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-06-02
J
u
n
i
o
C Ha
m
ano
Merge branch 'rs
/
m
aint-grep-word-regex
p
-fix' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Mer
g
e branch
'
sb/maint-1
.
6
.
2-opt-filename-
f
ix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio C
H
am
a
no
Merge bran
c
h
'jc/maint-add-p-coalesce-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Hamano
Merge branch 'tr/maint
-
do
c
-
s
tash-pop' into
m
aint
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 Hamano
Merge b
r
anch 'js/maint-n
o
-ln-ac
r
oss-l
i
bexec
-
and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Hama
n
o
Merge branch 'lt/main
t
-diff-reduce-lst
a
t
' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ham
a
no
Merg
e
br
a
nch 'jm/format-patch
-
no-auto-n-
w
hen-k-is-giv
e
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'do/ma
i
nt-mer
g
e-recursi
v
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Ham
a
no
Merg
e
branch 'jk/ma
i
nt-1
.
6
.
0-trace-argv' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Ham
a
no
M
erge
branch 'np/push-de
l
ta' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
H
amano
M
e
r
ge branch 'ar/merge-one-file-d
i
ag' into
m
ain
t
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C H
a
m
a
no
Merge branch 'ar/unlink-
e
rr' into main
t
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
M
e
r
ge bran
c
h 'jk/
m
aint
-
a
d
d-em
p
ty'
into
mai
n
t
commit
|
commitdiff
|
tree
2009-05-24
Junio
C Hama
n
o
Mer
g
e
b
r
a
n
ch 'maint-1
.
6
.
2'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merg
e
branch 'maint-1
.
6
.
1' int
o
main
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
J
u
nio C Hamano
Merge branc
h
'mai
n
t-1
.
6
.
0'
i
nto m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C Hamano
co
m
pletion:
enhance "current branch" disp
l
ay
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Hama
n
o
complet
i
o
n
:
si
m
pl
i
f
y
"current branch" in
__git_p
s
1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Hamano
comple
t
ion: fix PS
1
display during a
m
e
r
g
e on detached
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C Ham
a
no
Revert
"
git-add--interactive
:
remove
hunk coa
l
e
s
c
ing"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Hamano
Merge bra
n
ch 'maint-1
.
6
.
2' into m
a
int
commit
|
commitdiff
|
tree
2009-05-14
J
u
nio C Hamano
Merge
b
r
a
nch 'maint-1
.
6
.
1' into ma
i
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
J
unio
C
Hamano
Me
r
ge branch
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Junio 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 H
a
mano
Merge br
a
nch 'm
a
int-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio
C
Ham
a
n
o
Merge bra
n
ch 'jc/
m
aint-rea
d
-tree
-
multi' in
t
o main
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Ju
n
io
C Hamano
Revert "checkout branch
:
prime cache-tree
f
ully"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Ju
n
io C Hamano
archive-
t
ar
.
c: sque
l
ch
a type mismatch wa
r
ning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Ha
m
ano
Start 1
.
6
.
3
.
1 maintenan
c
e s
e
r
ies
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C Ham
a
no
Mer
g
e branch 'maint-1
.
6
.
1' into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Juni
o
C Hamano
Me
r
g
e branch 'maint-1
.
6
.
0' int
o
maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
J
u
nio C
H
amano
GIT 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Ha
m
a
no
git-clean d
o
c: the
c
omma
n
d only affects paths under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio
C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Merge bra
n
ch 'rj/mai
n
t-1
.
6
.
0-svn-parse-f
i
x'
into main
t
commit
|
commitdiff
|
tree
2009-05-06
Junio
C
Hamano
M
e
rge branch 'maint-1
.
6
.
0' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
J
u
n
io C Ha
m
ano
Sync with GIT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Hamano
GIT 1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
n
o
Merge branch
'
np/m
a
int-n
o
-of
s
-delta' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge
b
ranch 'maint-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C Hamano
GIT 1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
M
erg
e
br
a
nch
'
jc/main
t
-r
e
ad
-
tree-
m
ulti' int
o
maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Me
r
ge branch 'mk/maint
-
apply-swap' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'mm/m
a
int-
a
dd-p-
q
uit' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Ham
a
no
M
er
g
e
b
ranch 'lt/pac
k
-object-m
e
muse' int
o
maint
commit
|
commitdiff
|
tree
2009-05-03
J
uni
o
C Hama
n
o
Merg
e
bra
n
ch 'jc/maint-1
.
6
.
0-
k
e
e
p-pa
c
k
'
i
nt
o
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Haman
o
Mer
g
e branch 'jc/maint-1
.
6
.
0-di
f
f-borrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
e
rge branch 'b
s
/maint-1
.
6
.
0-
t
ree
-
walk-prefix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Juni
o
C
H
aman
o
GI
T
1
.
6
.
3
-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Juni
o
C Hamano
Merge git
:
//repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-05-01
Junio C Hamano
Merge git://gi
t
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ha
m
an
o
Mer
g
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
io
C Hamano
merge-recursive: d
o
not die on a conflicting s
u
bmodule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Jun
i
o
C Hamano
Merge b
r
anch 'maint-1
.
6
.
1' i
n
to main
t
commit
|
commitdiff
|
tree
2009-04-29
Junio
C Hamano
Me
r
ge branch 'maint-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C
Hamano
diff -c -p: do not
d
ie on s
u
bmodule
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
J
unio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge
b
ranch 'ma
i
n
t-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
GIT
1
.
6
.
3
-
r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
J
unio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-04-25
J
unio
C Hamano
Merg
e
branch '
m
a
int-1
.
6
.
1' into m
a
in
t
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Mer
g
e
b
r
anch 'maint
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Juni
o
C Hamano
Mak
e
f
i
le:
i
gnore perl/ subdirectory under
N
O
_
PERL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Junio C Ham
a
no
Merge branch 'jc/maint-read-tree-
m
u
l
ti'
commit
|
commitdiff
|
tree
2009-04-21
Juni
o
C Hamano
R
evert "stat_track
i
ng_in
f
o():
only
c
ou
n
t real commi
t
s"
commit
|
commitdiff
|
tree
2009-04-21
Junio C Ha
m
ano
Merge b
r
anch 'mk/maint-apply-swap
'
commit
|
commitdiff
|
tree
2009-04-21
Ju
n
io C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-04-20
Junio C Haman
o
c
h
ec
k
out
branch: prime cache-tre
e
fully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o
C
Hamano
read-tree
-
m
A
B:
p
r
ime cache-tree f
r
om the switched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C
Hamano
Move pri
m
e_cache_
t
ree
(
) to cache-t
r
ee
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
H
am
a
no
rea
d
-t
r
ee
A
B: do not
corrup
t
cache
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio C Hamano
M
e
r
ge branch
'
mm/maint-a
d
d
-
p-quit'
commit
|
commitdiff
|
tree
2009-04-20
Junio C
H
amano
Sync with 1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next