repo.or.cz
/
alt-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 Hamano
git-add -u: match the
i
nd
e
x with wor
k
ing tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Ha
m
ano
Merge b
r
anch '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
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge br
a
nch
'fl
/
c
vsser
v
er
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
H
amano
Update draft rele
a
se notes for 1
.
5
.
2 with accu
m
ulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
ma
n
o
Start pr
e
p
ar
i
ng for
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
Merg
e
bran
c
h 'maste
r
' of git:
/
/repo
.
o
r
.
cz/git
-
g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch
'
maint' of git:
/
/
r
epo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
M
erge branch 'jc/
r
ead-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-gui: Honor
TCLTK_PATH if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C
Hamano
M
e
r
ge
b
ranch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
send-email: do not
leav
e
an empty CC: line
if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
M
erge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Me
r
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Merge gi
t
:/
/
git2
.
kernel
.
o
r
g/pub
/
s
cm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Haman
o
Do not defau
l
t to --no-index when give
n
two d
i
r
ec
t
ories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Merg
e
br
a
nch 'jc/ch
e
rr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
J
unio
C
H
am
a
no
Fix git {
l
og,sh
o
w,
.
.
.
} --pretty=
e
ma
i
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentation:
--ch
e
rry-p
i
ck
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ha
m
ano
gi
t
-log --cher
r
y-
p
ick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o
C
H
a
mano
Refactor
p
atch-id filtering
o
ut of g
i
t-cher
r
y and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
man
o
Add
%m to '
-
-pretty=format
:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio 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
f
sck: do not compl
a
in
o
n
det
a
ched HEA
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o C Hamano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C Hamano
t3030: merge-re
c
ursive backend tes
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
merge-
r
ec
u
r
s
ive
:
handle
D/F conflic
t
case
more
c
arefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
mer
g
e-re
c
ursiv
e
: do
n
ot b
a
rf on
"
to be removed" ent
r
ie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
aman
o
Treat
D/F
c
onflic
t
e
n
try more
carefull
y
in
u
n
pack
-
trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
t1000: fix case t
a
b
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
sh
o
rt
l
og
-w:
make w
r
ap-
l
in
e
behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge br
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Me
r
ge
b
ranch 'jc/merg
e
-subtre
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge bran
c
h 'js/fetch-
p
rogress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge bra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add
Documentat
i
on/cmd-list
.
m
a
d
e to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cy
c
le by prepareing
R
elNotes 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'
(
e
a
rly part
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
P
r
epare
for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
H
ama
n
o
A
new merge
s
tr
a
gety 'subtree
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C Hamano
git-
p
ush to multiple locations does not st
o
p at
the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Haman
o
git
-
push reports the URL a
f
ter failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Me
r
g
e
branch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
Merge bra
n
ch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Ham
a
n
o
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Merge branch 'jc/checkout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C
Hamano
Document
a
tion: tig
h
t
e
n dependency f
o
r git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
g
i
t
-
bis
e
c
t
: a
l
low b
i
sectin
g
w
i
th onl
y
one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030: ad
d
a b
i
t more tests
to git
-
bise
c
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-b
i
se
c
t: mode
r
nizati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Rename a
d
d
_
f
i
l
e_to_index()
t
o add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rename stati
c
vari
a
b
l
e writ
e
_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hama
n
o
Rena
m
e
i
nternal function "add_file_to_cache" in builti
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
H
a
man
o
Propagate cache error i
n
ternal to
refresh_cache() v
i
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
i
o
C Hamano
Fix bogus error mess
a
g
e
from merge-
r
ec
u
rsive erro
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Fix
depende
n
cy
o
f
c
ommon-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
ano
RPM spec:
include
g
it-p4 in the list o
f
all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C Haman
o
re
r
e
r
e
: mak
e
sorting
real
l
y s
t
a
b
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix switching to a branch
w
it
h
D
/
F w
h
en current branch
.
.
.
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
p
assed d/f conflict
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Fix read-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C Hamano
un
p
a
c
k-trees: ge
t
rid
o
f *i
n
dpos parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_tree
s
.
c: pass unpack_trees_optio
n
s structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hamano
add_c
a
che_
e
ntry(): removal of file foo doe
s
not con
f
li
c
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Haman
o
Merge
b
r
a
nch
'
jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
Ham
a
no
M
erge
branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
am
a
n
o
Merge bra
n
ch 'post1
.
5
.
1/t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Me
r
ge branch
'post1
.
5
.
1/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge
b
r
a
nch 'lt/
d
irwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
g
it-read-tree --index-output=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
_GIT_
I
N
DEX_OUTPUT: allow
plumbing to outpu
t
to
an alter
n
ativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
checkout: allow detaching to
H
EA
D
even when swi
t
c
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
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
Ju
n
io C Haman
o
rerere shou
l
d not repeat the
e
arlier hunks
i
n
later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Ju
n
i
o
C Hamano
H
o
pe
f
ully fin
a
l
update to the dr
a
f
t Re
l
ea
s
e Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
H
a
m
a
no
Opti
o
n
a
l Tck/Tk: ignore generated
f
iles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do not b
o
the
r
documenting fet
c
h-
-
to
o
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Upda
t
e draft release
notes for
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Ha
m
ano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Merge
branch 'maste
r
'
o
f git://
r
epo
.
or
.
cz/g
i
t
/
mergetool
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io
C
Haman
o
Docu
m
ent
a
t
i
on
:
unbr
e
ak us
e
r-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C
H
amano
G
IT 1
.
5
.
1-
r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Ha
m
ano
Upda
t
e main
g
it
.
h
t
ml page to point at
1
.
5
.
0
.
6 docu
m
e
nt
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
M
e
r
g
e b
r
anch
'
maint' t
o
synchronize
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Fix
"--pr
e
t
t
y
=
format:" for parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
git-commit: "read-t
r
ee
-
m HEAD" is not the right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
H
amano
sha1_file
.
c (write_sha1_file
)
: De
t
ec
t
cl
o
se failu
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next