repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-add -u: match the index with working tree.
2007-04-20
Junio C Ham
a
no
g
it-add -u: ma
t
ch the index
w
ith working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
a
no
M
erge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merge b
r
a
n
c
h
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h 'fl/cv
s
s
erver'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Hama
n
o
Merge
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Update d
r
aft r
e
lease n
o
tes for
1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
S
tar
t
preparing
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
M
e
rge bra
n
ch '
m
aster' of
git
:
//re
p
o
.
or
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
H
aman
o
Merge branch 'maint'
of git://repo
.
or
.
cz/git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
M
e
r
ge branc
h
'jc/r
e
a
d
-tree
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C Ha
m
ano
git
-
gui: Honor TCLTK_PATH
i
f supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
Merge branch 'js/wrap-l
o
g'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C
H
amano
send-
e
ma
i
l:
do not leave an
e
mpty CC: li
n
e i
f
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ha
m
a
no
Merg
e
git://git2
.
kernel
.
org/pub/s
c
m/gitk
/
git
k
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Do not default to --n
o
-in
d
ex when given two
d
i
rectorie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Merge br
a
nch '
j
c
/
ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Fix
git {log,show,
.
.
.
} -
-
pretty=emai
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
Doc
u
mentat
i
o
n
: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
git-log --
c
herr
y
-pic
k
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patc
h
-id filtering out of git-
c
herry
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Haman
o
Ad
d
%m to '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Haman
o
Mer
g
e
bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio 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: do
not complain
o
n detac
h
e
d
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C
H
amano
Mer
g
e bra
n
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t30
3
0: merge
-
r
e
cursive back
e
nd test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
m
e
r
g
e-recur
s
ive: handle D/F conflict case
m
ore carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
merge-recursive: do not barf on "to be remo
v
ed
"
entri
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C
Hama
n
o
Treat D/F conflict entry m
o
r
e
c
a
r
ef
u
lly in un
p
ack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
H
amano
t
1
000: fix case tabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
short
l
og -w:
m
ake w
r
a
p-line behav
i
our optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge branch
'
jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merge branch 'jc
/
merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Mer
g
e
b
r
a
nch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge
b
ranc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Haman
o
Add Doc
u
m
e
nta
t
ion/cmd-list
.
made to
.
gitigno
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Start 1
.
5
.
2
c
y
cle by p
r
epare
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 part
)
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Me
r
g
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Ham
a
no
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
n
ew merge straget
y
'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Hamano
git-push to
multipl
e
location
s
do
e
s not stop
a
t the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-
p
ush reports t
h
e U
R
L
a
fter
failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Hama
n
o
Mer
g
e b
r
anc
h
'
jc/inde
x
-o
u
tput'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C H
a
ma
n
o
Merge b
r
an
c
h
'
fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
Merge
b
ranch
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge
br
a
nch
'jc/
c
heckout'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documentation: tighten d
e
pendency f
o
r git
.
{htm
l
,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
i
t-bisect: allow b
i
s
ec
t
ing
with only one
bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
t6
0
30: ad
d
a
b
i
t
m
ore tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
Hama
n
o
git-bisect: m
o
de
r
ni
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
e
r
g
e
b
r
anc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C
H
amano
R
ename add_file_to_in
d
ex(
)
to add_file_to_cach
e
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static var
i
a
ble write_index to update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename internal funct
i
o
n "add
_
file_to_cache" i
n
builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Propagate cache error inte
r
nal to refresh_c
a
che() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Ha
m
ano
Fix
b
o
g
us error messag
e
from mer
g
e
-recursive erro
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
F
i
x dependency of comm
o
n-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RP
M
spec: include git-p4 in
t
h
e lis
t
of all p
a
ckages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Ha
m
ano
r
erere: make sorting really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix swit
c
hin
g
to
a branch with D/F
w
hen cu
r
re
n
t branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix twoway_
m
e
rge that p
a
ssed d/f
c
onflict mark
e
r t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-tree --p
r
efix=d
i
r/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
unp
a
ck
-
trees: get rid of *indpos parame
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Ham
a
no
u
n
pa
c
k_trees
.
c: pass
u
npack_trees_option
s
structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C H
a
ma
n
o
add_cache_entry(): removal of file
f
oo
d
oes
n
o
t
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
an
o
Me
r
g
e branch 'jc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
M
e
rge branc
h
'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
Merge branch
'
post1
.
5
.
1/bl
a
me
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
M
erge branch 'post1
.
5
.
1/t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
Haman
o
M
erge
branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
M
e
rge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
git
-
read-tree --index-output=<fil
e
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
_GIT_INDE
X
_OUTPUT: a
l
l
o
w plum
b
ing to out
p
ut to an
a
lterna
t
iv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
ch
e
ckout: a
l
low detaching to HEAD eve
n
wh
e
n sw
i
tching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
G
I
T 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C H
a
m
ano
M
e
rge 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
Junio
C
H
a
m
a
no
rer
e
re
sh
o
uld not r
e
p
eat th
e
earli
e
r
hunk
s
in lat
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully fina
l
update t
o
t
h
e draft Release Not
e
s
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
Hamano
Optiona
l
Tck
/
Tk: ign
o
re g
e
n
e
r
ated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o
C Hamano
Do not
b
oth
e
r do
c
umenting f
e
t
c
h--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
U
p
d
a
te draft
r
elease notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Hamano
Merge branch 'master' of git://re
p
o
.
or
.
cz/git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Ha
m
a
no
Documentation: unbreak
u
s
er-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
GIT
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
Update main git
.
html page
to point at 1
.
5
.
0
.
6 do
c
u
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Merge br
a
nch 'maint' to
synchronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
mano
F
i
x "--pret
t
y
=
f
o
rmat:"
f
or parent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
git-
c
ommit: "read-
t
ree
-
m HEAD" is
n
ot the right wa
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
unio C
Hamano
sh
a
1
_f
i
le
.
c (write_sha1_file): Detect close f
a
i
lure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next