repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' of git://repo.or.cz/git-gui
2007-04-18
J
unio C Hamano
Merge
b
ranch
'
ma
s
ter
'
of git://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Merge bran
c
h 'jc/re
a
d-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
gi
t
-gu
i
:
Honor TCLTK
_
P
ATH if
s
u
p
plied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Ham
a
no
Merge
b
ranc
h
'
js/wrap-log
'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
se
n
d
-email: d
o
not
leave an empty CC: l
i
ne if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge
g
it://git2
.
ke
r
nel
.
org/p
u
b
/scm
/
g
itk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
Merg
e
br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C Ha
m
ano
Do
n
ot d
e
fault
t
o --
n
o
-
index when given
t
w
o
dir
e
ctories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
io C Hamano
Merg
e
branch
'
j
c/cher
r
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
H
a
m
a
no
Fi
x
git {
l
og,show,
.
.
.
}
-
-pret
t
y=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
D
ocu
m
enta
t
ion:
-
-
cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
gi
t
-l
o
g
--c
h
e
r
r
y
-
p
i
ck A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
H
amano
Refactor p
a
tc
h
-id filtering out of git-cherry
a
n
d git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C
H
a
mano
Add %m to '--pre
t
t
y
=for
m
at:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Me
r
ge
branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C H
a
m
ano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
f
s
ck: do
not complain on de
t
ached HE
A
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
Mer
g
e bran
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030: merge-recursive bac
k
e
nd test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C
H
aman
o
merge-recursive: handle D/F confl
i
ct
c
a
se mo
r
e carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
m
ano
merge-r
e
cursive: do
n
ot
b
arf on "to be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Ha
m
ano
T
r
eat D/F conflict en
t
ry more c
a
refully
i
n
u
npack-tre
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Ha
m
ano
t1000:
f
ix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
a
ma
n
o
s
hortlog -w: ma
k
e wrap-line behavi
o
ur
optiona
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge
b
r
a
n
ch 'jc/pu
s
h'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Mer
g
e branch 'jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge branch 'js/fetc
h
-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Add
D
ocument
a
tion/cmd-l
i
s
t
.
m
a
de
t
o
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Start 1
.
5
.
2
c
ycle by prepare
i
ng
RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'jc
/
read
-
tree-df' (early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Prepare f
o
r
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C Hamano
A new merge stragety
'
s
ubtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
gi
t
-pus
h
to multiple locations do
e
s
no
t
s
top at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
git-push reports the URL af
t
er f
a
ilin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
b
ranch 'jc/inde
x
-ou
t
put
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
H
a
mano
Me
r
ge bran
c
h '
f
p
/
make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Merge bra
n
c
h
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/
c
he
c
kout
'
(ea
r
ly pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Me
r
g
e
branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Hamano
D
o
c
u
mentation:
t
ighten de
p
endency for
g
i
t
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
git-bisect: al
l
ow bisecting with on
l
y one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Haman
o
t6030
:
add a bit mor
e
t
e
s
t
s
to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
g
i
t-b
i
se
c
t
: moderniz
a
t
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Merge bra
n
c
h
'
maint
'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e add_file_
t
o_index() to add_f
i
le_to
_
c
a
che()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Rename static v
a
riable write_i
n
dex to update_i
n
d
e
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Rename internal function "add
_
f
i
le_to_cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Propaga
t
e
c
ache er
r
or
internal to re
f
re
s
h_cach
e
()
v
ia
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Fix b
o
gus error
me
s
sage
f
rom merg
e
-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix
d
e
p
e
n
den
c
y
o
f co
m
mon-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Haman
o
RPM
s
p
ec: include git-p4 in the
l
ist of
all pa
c
kages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
rerere: make sorting really stabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hama
n
o
Fix swit
c
hing to a branch
with D/F when cur
r
ent bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Hamano
Fix twoway_mer
g
e
that pa
s
sed d
/
f confl
i
c
t marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
r
e
a
d
-tree --pre
f
ix
=
dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
m
ano
unpack-trees:
g
et rid of *indpos p
a
r
ameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
un
p
a
c
k_tre
e
s
.
c: pass unpack_
t
rees
_
optio
n
s struct
u
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
add_c
a
che_entr
y
(): re
m
o
v
a
l of fi
l
e fo
o
d
o
es n
o
t
conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
M
e
rge br
a
nch '
j
c
/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
b
ran
c
h
'
f
l
/
d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge b
r
anch 'post1
.
5
.
1
/b
l
ame
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
an
o
Merge bran
c
h 'post1
.
5
.
1
/
tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Merg
e
branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
Merge
b
ranch '
l
t/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
git-read
-
t
r
e
e --
i
ndex
-
outp
u
t=<
f
i
l
e>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Ham
a
no
_GIT_IN
D
EX_OUTPUT: allow plum
b
i
ng to outp
u
t
to an
alt
e
rnativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
checkout: allow detaching to HEAD ev
e
n
w
hen switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
GIT
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
re
r
ere
s
hould not
repeat the earlier hu
n
ks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hama
n
o
Hopefully
fina
l
up
d
ate
t
o the draft
R
elease Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
J
unio C Hamano
Optional Tck/Tk: ign
o
re generate
d
files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
D
o
not bo
t
he
r
documenti
n
g
f
etc
h
--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
ama
n
o
Update draft releas
e
n
otes f
o
r
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Ha
m
ano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
n
o
Merge branch 'master' of
g
it://repo
.
o
r
.
cz/
g
it/mer
g
etool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documentation: unbreak us
e
r-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
U
p
date main g
i
t
.
html p
a
ge
to point at 1
.
5
.
0
.
6
d
o
cu
m
entation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
Merge branch 'maint' to sy
n
c
hronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
G
I
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--pretty=format:" fo
r
pare
n
t rela
t
ed
ite
m
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
git-c
o
mmit:
"
read-tree
-m HEA
D
" is
n
ot the
right wa
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o
C
H
amano
sha1_file
.
c (writ
e
_sha1_file): Detec
t
clos
e
fa
i
lure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Ham
a
no
Do
c
ument git-log --first
-
parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
unio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C
Hamano
Me
r
ge br
a
nch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Update
README to point
a
t a few key per
i
odical
message
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merg
e
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Hamano
Merge branch 'm
a
int' of
git://linux-nfs
.
org/~bfiel
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C Hamano
Merge branch
'
js/remote-show
-
push
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
M
erg
e
branc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
Ha
m
an
o
git-am documentation:
d
escribe what is
t
a
k
en fr
o
m where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
mano
make the previous
o
p
timizati
o
n
work also on path-limited
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next