repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2007-04-18
J
unio
C
Hamano
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
St
a
rt preparing for
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
Hamano
Me
r
ge br
a
n
ch 'ma
s
ter
'
of
git:/
/
r
e
po
.
or
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch
'maint' of g
i
t
://re
p
o
.
or
.
cz/git-
g
ui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Haman
o
Mer
g
e
b
r
anch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-
g
u
i: Honor TCLTK_PATH i
f
supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C H
a
man
o
M
er
g
e branc
h
'j
s
/wra
p
-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Ham
a
no
send-email: do not l
e
ave an
e
m
pty CC: line
i
f
no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Merge g
i
t:/
/
git2
.
ker
n
e
l
.
org/pub/scm/gitk/gitk
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Merge b
r
a
nch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Do not default
t
o
--no
-
i
n
dex when given two dire
c
t
o
ries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o
C
Hamano
Merge branc
h
'jc/
c
h
err
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merge
branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Hamano
Fix g
i
t {log,sh
o
w,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Doc
u
m
e
ntati
o
n: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hama
n
o
git-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refac
t
or patch-id filteri
n
g
o
u
t of git
-
c
h
er
r
y and
git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C Ham
a
no
A
d
d %m to '--
p
retty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C H
a
mano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck:
d
o not
c
omp
l
ain on
d
e
tached
H
E
A
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Me
r
ge br
a
nch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
t3030: merg
e
-recursive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merg
e
-recursive: handle D
/
F co
n
flict case more
c
a
r
eful
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
merg
e
-recursive: do
not barf on "
t
o be r
e
moved" entr
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
Treat D/F conflict entry more carefully
i
n
u
npack-
t
rees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Ha
m
ano
t1000
:
fix c
a
se tab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
s
hor
t
log -w:
m
ake w
r
ap-line b
e
ha
v
iour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
ge br
a
nch
'
j
c
/pu
s
h'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C H
a
mano
M
e
rge branch 'jc/
m
erge-sub
t
ree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merg
e
branch
'js/fetch-pr
o
gr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge bra
n
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documentat
i
on/cmd-lis
t
.
m
ade t
o
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
i
o
C
Ham
a
no
Start 1
.
5
.
2
cycl
e
by prep
a
r
ei
n
g RelNo
t
es
for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Merge bran
c
h
'
jc/read-tree-df
'
(early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
H
am
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
P
repare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
A new merge stragety 'subt
r
ee'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
git-push to
m
ultiple lo
c
ations
do
e
s not stop at th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Haman
o
git-p
u
sh
repor
t
s t
h
e URL after fai
l
in
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
amano
Me
r
ge branch 'jc/
i
n
dex-
o
u
t
put'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge
b
ranc
h
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C Hamano
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge bra
n
c
h
'jc/
c
heckout'
(e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o C Haman
o
Do
c
umenta
t
i
o
n:
tigh
t
en d
e
p
endency for
git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
git-bisect: all
o
w bisecting
with
o
nly one bad
c
ommit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030:
add
a
bit more
t
ests t
o
git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
io C
Hamano
g
it-bisect: modern
i
zat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Ren
a
me ad
d
_file_
t
o_index(
)
t
o add_f
i
l
e_
t
o
_cache
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Ham
a
n
o
R
e
name
s
tati
c
v
a
r
i
able wri
t
e_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
man
o
Rename internal f
u
n
ction
"
add_file_to
_
c
ache
"
i
n
builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Propagat
e
cac
h
e
er
r
or internal to refresh_cache() vi
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
i
x
bogus
error
m
essage from merge-recursiv
e
er
r
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
F
ix depend
e
ncy of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RP
M
spe
c
:
i
nclude
gi
t
-p4 in
t
he list
of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
a
no
rerere: make sorting r
e
a
lly stab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fi
x
s
witchi
n
g to a
b
ranch with D/F when
c
u
rrent bran
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Fi
x
t
woway_mer
g
e that passed d/f con
f
lict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C
Hamano
Fix rea
d
-tree -
-
prefix=d
i
r/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
unpack-trees: get rid of
*
i
n
dpos
p
arameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
m
ano
u
n
pack_trees
.
c: pas
s
unpa
c
k_trees_options s
t
ruct
u
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cach
e
_entry()
:
removal of fi
l
e foo do
e
s
not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
amano
M
e
r
ge br
a
nch 'jc/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge b
r
a
n
ch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'post1
.
5
.
1
/
tcltk'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
Mer
g
e branch 'post1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
aman
o
git-read-tree
--index-output
=
<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
_GI
T
_INDEX_OUTPUT:
a
ll
o
w
plumbing
t
o
outpu
t
to an altern
a
tiv
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
che
c
kout: allow detach
i
ng to HEAD even when switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
GIT
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge 1
.
5
.
0
.
7
i
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
G
I
T 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
rerere should not
r
e
peat
the earlier hunks
in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully
final
u
pdate to the draft Rele
a
s
e
Notes
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
O
p
tional Tck/Tk
:
ig
n
or
e
generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do
n
ot
b
other documentin
g
fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C
H
ama
n
o
Update dr
a
ft r
e
lea
s
e notes for
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
i
o
C
H
am
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
a
n
o
M
e
r
ge branch 'master' of git://repo
.
o
r
.
cz/git/mergetool
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio
C
H
amano
D
ocume
n
tation: unbreak user-
m
a
n
ua
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
GIT 1
.
5
.
1-rc
3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Ham
a
no
Upd
a
te
main git
.
h
t
m
l
pa
g
e
t
o
point at
1
.
5
.
0
.
6 documentati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
Merge branch 'm
a
int
'
to synchro
n
i
z
e with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C
H
a
m
ano
Fix "--pretty=
f
o
r
m
at
:
" for pa
r
ent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
git-commi
t
: "read-tree
-
m
H
EAD" is not the
r
ight way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
sha1
_
f
ile
.
c (write_s
h
a1_
f
ile): D
e
tect close failu
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Docu
m
e
nt
g
i
t
-log --f
i
r
s
t-pa
r
en
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C Hama
n
o
Mer
g
e
br
a
nch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C Hamano
Update README to p
o
int
a
t a
f
e
w key peri
o
d
i
cal
m
ess
a
ges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Hamano
M
erge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C H
a
mano
Merge branch '
m
aint' of
g
it://linux-nfs
.
org/~b
f
i
e
lds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch 'j
s
/r
e
m
ote
-
show
-
pus
h
'
commit
|
commitdiff
|
tree
next