repo.or.cz
/
git
/
ljr.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 Hamano
git-add -u: m
a
t
c
h the ind
e
x with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Me
r
ge b
r
anch '
f
l/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Haman
o
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Upda
t
e draft re
l
ea
s
e notes for
1
.
5
.
2 with accu
m
ulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch 'master' of g
i
t://rep
o
.
o
r
.
cz/
g
it-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint' of git://r
e
po
.
or
.
c
z
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
M
erge
branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
amano
git-gui: Ho
n
or TCLTK_PATH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
Merge
branch 'js/wrap-l
o
g'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hama
n
o
send-ema
i
l: do
not leave an
e
mpty
C
C: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Haman
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o C Hamano
Mer
g
e
git://git
2
.
ke
r
nel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Ham
a
no
Mer
g
e b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o C Hamano
Do no
t
defa
u
lt to -
-
n
o
-ind
e
x when gi
v
en t
w
o direc
t
ories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Merge branch
'
j
c
/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log,
s
how,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C Hamano
Documentation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C H
a
m
ano
git-log --
c
herry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hama
n
o
Refactor patch-id filtering out of
git-ch
e
rry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
A
d
d
%m to '--pr
e
t
t
y=f
o
r
m
at:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o 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 n
o
t
com
p
la
i
n on
deta
c
hed HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
3030: m
e
rge-recur
s
i
v
e ba
c
k
end test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C Ham
a
no
merge-r
e
cursive: handle D/
F
co
n
flic
t
case
more car
e
fully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recursive: do not barf on
"
t
o be removed"
entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Tre
a
t D/F conflict entry more c
a
refully
i
n u
n
pack-tree
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C
H
amano
t1
0
00: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
shortlog -w:
make wrap-line
b
ehaviour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Merg
e
branch
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Me
r
ge bra
n
ch '
j
c/merge-
s
ubtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merge branch 'js/fetch-
p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
A
dd Docu
m
enta
t
i
o
n/cm
d
-list
.
made
t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
S
tart 1
.
5
.
2
cycle by prepa
r
ein
g
Rel
N
otes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
i
o
C Ham
a
n
o
Me
r
ge branch 'jc/read-tree-
d
f
'
(early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
P
r
e
pare
for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
A new m
e
rge
stra
g
e
t
y '
s
ubtr
e
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-pus
h
to mult
i
ple locations
d
oes not stop a
t
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-pus
h
report
s
the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Hamano
Merge
b
ranc
h
'jc/index-o
u
t
put'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Me
r
ge branc
h
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'cc/bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'j
c
/
checkout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
br
a
n
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Documentation: tighten
dependency for
git
.
{
htm
l
,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C H
a
man
o
git-bis
e
ct:
allow bisecting with
o
nly
o
n
e
bad
c
o
m
m
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
t6030: add a bit more tes
t
s t
o
git-b
i
sect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
nio C Hamano
git-bi
s
ect: mod
e
r
n
izat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Ham
a
no
M
e
rge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
n
o
R
e
name add_fil
e
_to_index(
)
to add_fil
e
_to_c
a
che()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Rename
static variable writ
e
_
i
ndex t
o
update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename interna
l
f
u
nction "add_fi
l
e_to_c
a
c
h
e
" in builti
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Propagate cache error
internal to refresh
_
cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hama
n
o
F
i
x bogus
err
o
r mess
a
ge from merge-rec
u
rsive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Ha
m
ano
F
i
x dependency of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
R
PM spec: i
n
clude git-p4 in the list
o
f all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
r
e
rere: make sorting really s
t
abl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
ma
n
o
F
ix s
w
itching to
a bran
c
h wi
t
h D/F when current branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Fix tw
o
way
_
m
e
r
g
e that pas
s
ed d/f
confl
i
ct marker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Fix
read-tree --prefix=dir
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
u
npack-trees: get rid of *indpos p
a
rameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
unpack_trees
.
c
: pass unpa
c
k_trees_options struct
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
a
d
d_
c
ache_entry(): removal o
f
file foo does not
c
onflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Me
r
ge branch
'
j
c/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Mer
g
e
b
r
anch 'fl/d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
n
o
M
e
r
g
e bra
n
ch '
p
o
s
t
1
.
5
.
1
/
b
lame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erge bran
c
h
'
post1
.
5
.
1
/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branc
h
'post1
.
5
.
1
/
p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
aman
o
Merge bra
n
ch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hamano
git-rea
d
-tree --index-
o
utput=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Ham
a
no
_
G
IT_INDEX_OUTPUT
:
allow plumbing to output to an alt
e
rn
a
tiv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
che
c
kou
t
: allow d
e
tach
i
n
g
to HEAD even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
G
IT 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
Jun
i
o C
H
ama
n
o
GIT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
rer
e
re
s
hould not
r
e
peat the
earlier
hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Jun
i
o C Ha
m
ano
Hop
e
fully fin
a
l update to the draft
R
elease Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk:
i
g
nor
e
generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
aman
o
D
o not bother doc
u
m
e
nt
i
ng
f
etc
h
--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
n
i
o C Hamano
Up
d
ate
draft
r
ele
a
se notes
f
or 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Ha
m
ano
Merge b
r
anch 'master' of
g
i
t
://repo
.
o
r
.
c
z
/g
i
t/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Documentation:
unbreak us
e
r-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
GIT 1
.
5
.
1-
r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Upd
a
te main gi
t
.
html page to point at
1
.
5
.
0
.
6 do
c
u
m
en
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
Merge b
r
anch 'maint' to sy
n
chroni
z
e w
i
th 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
Fix "
-
-pr
e
tty
=
fo
r
m
a
t:" for
p
are
n
t related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
un
i
o C
Hamano
git-commit: "
r
ead-tree -m HEAD" is not
t
h
e right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
sha1_
f
ile
.
c (write
_
sha1_f
i
le): D
e
te
c
t clos
e
fai
l
ur
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next