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
Add basic infrastructure to assign attributes to paths
2007-04-14
Junio C Hama
n
o
Add basic in
f
ras
t
ructure to assign attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
M
e
rg
e
br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do n
o
t default to -
-
n
o
-
i
ndex when given two direc
t
ories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Me
r
ge b
r
anch 'jc/cherr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C H
a
mano
Fix git
{
log,show,
.
.
.
} --
p
r
etty
=
email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Documentation: --cherry-pic
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
git
-
log
--cherr
y
-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o
C
Hama
n
o
Refac
t
or
p
atch-id
filt
e
ring out of git
-
c
he
r
ry
a
nd git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Ham
a
no
Add %m t
o
'--pretty=for
m
at
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
e
rge branch '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
f
s
ck: do not com
p
l
a
in on det
a
ched HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Merge bra
n
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
Hamano
Merge bra
n
ch 'j
c
/
m
erge-subtre
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hama
n
o
Merge
b
ranc
h
'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Add Documen
t
a
t
ion/
c
md
-
list
.
made to
.
g
itignor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Start
1
.
5
.
2
cycle
by preparei
n
g RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
er
g
e
branch '
j
c/read-tree-df' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C
Ha
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C H
a
mano
Pr
e
p
a
r
e
for
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
Ha
m
a
n
o
A new merg
e
straget
y
'subtr
e
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-push
t
o multiple locat
i
ons does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push report
s
the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C Hamano
M
e
r
ge bran
c
h 'jc/index
-
output'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Merge b
r
anch 'fp/mak
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ha
m
ano
Merg
e
branch
'
c
c/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
erge
b
r
a
n
ch 'jc/
c
heckout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Documentation
:
t
i
ghten depe
n
dency for git
.
{html,
t
xt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C H
a
mano
git-bisect: allow bisecting wi
t
h only one bad com
m
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030:
a
dd a bit more tests to
gi
t
-b
i
sect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
io C Hamano
git-bi
s
ect:
m
od
e
rnization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
mano
Ren
a
me
a
dd_file_to_index() to add_file_to_cac
h
e
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Rename s
t
a
t
i
c var
i
able wr
i
te_
i
ndex to
update
_
index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hama
n
o
Rena
m
e
i
n
ternal function "add_file_to
_
c
ache" in
b
uilt
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Propagate
c
a
c
he
e
rror internal to refre
s
h
_
cac
h
e() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Fix bogus err
o
r
m
e
s
sa
g
e from merge-recu
r
sive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Fix depe
n
dency of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
RPM spec: inc
l
ude git-p4 in t
h
e
l
i
st of all package
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C
Hamano
r
e
rere: make sor
t
ing r
e
ally stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ham
a
n
o
Fix switching to a branch with D/F
when cur
r
ent b
r
anch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
tw
o
way
_
merg
e
that passed d/f
c
onflict
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Fix
read-tree --pr
e
fix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
unp
a
c
k-
t
rees: get rid of *indpos pa
r
ameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
aman
o
unpack_trees
.
c: pass
unpack_trees_opti
o
ns 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_ent
r
y():
removal
o
f file f
o
o
d
oes not c
o
nfli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge branch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
Merge branch '
f
l/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
M
e
rge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
amano
Merge branch
'
post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
M
e
rge branch '
p
ost1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Merge b
r
anch 'lt/dir
w
alk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
ama
n
o
g
it
-
read-tree --index-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT
_
IN
D
E
X
_OUTPUT: allow plumbing to out
p
ut to an altern
a
tiv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C H
a
m
ano
c
heckout: allow detaching to HE
A
D
e
v
e
n w
h
en switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
amano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
M
e
r
g
e 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
a
no
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
rerere sh
o
uld
n
o
t repeat
the e
a
r
lier hunks
in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio
C
H
a
mano
Ho
p
efu
l
ly final update
to th
e
dr
a
ft
R
e
lease Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
unio C Hamano
Opti
o
nal Tc
k
/Tk: ig
n
ore generated fi
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Do not bother d
o
cumenti
n
g fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
a
n
o
Upd
a
t
e draft release no
t
es fo
r
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Ham
a
no
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
M
e
rge bran
c
h 'mas
t
er' of
git://
r
epo
.
o
r
.
cz/git/me
r
g
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Ham
a
no
D
ocum
e
ntation:
u
nb
r
eak user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hama
n
o
GIT 1
.
5
.
1
-
rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
Update
main git
.
htm
l
page to point at 1
.
5
.
0
.
6
do
c
um
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
M
e
r
g
e br
a
nch 'maint' to syn
c
h
r
o
n
ize w
i
t
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
GIT
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
Fix "--pretty=f
o
rmat:" f
o
r parent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Ham
a
no
git-commit: "
r
ead-
t
ree -m
H
EAD" is not
t
h
e
rig
h
t
way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io
C
H
amano
sha1_
f
ile
.
c (
w
rite_s
h
a
1
_fi
l
e): Detect close failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document gi
t
-log --first-
p
ar
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio 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
H
amano
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hama
n
o
U
p
date README to
p
oi
n
t
at a
f
ew key pe
r
i
odical message
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
ano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C H
a
mano
Merg
e
branch '
m
a
i
nt
'
of git://l
i
n
ux
-
nfs
.
org/~b
f
ields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Hamano
Merge branch 'js/remote
-
show-
p
ush'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
aman
o
Merg
e
b
ranch
'm
a
int'
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
git-am documen
t
ation: describe what is t
a
ken from whe
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
u
n
io C Hamano
make the previous
optimiz
a
t
i
on work al
s
o
on path-lim
i
ted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
rev-list
-
-bisec
t
: Fix "halfway" o
p
timiz
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ha
m
ano
Merge branch 'master'
int
o
jc/b
i
sect
commit
|
commitdiff
|
tree
2007-03-24
Junio
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
J
unio C Hamano
Fix path-limited "rev
-
l
i
st --bisect" t
e
rmi
n
ation condit
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Jun
i
o C
Hamano
git-bis
e
c
t
.
sh: p
r
operly dq $GIT
_
DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hama
n
o
git-bis
e
ct: typofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
Ha
m
ano
checkout: rep
o
rt
where the
new HEAD i
s
upon deta
c
h
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
t6004: add
a
bit
mo
r
e path optimization test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
Ha
m
a
no
git-apply: D
o
not free the wr
o
ng b
u
ffer w
h
en we conve
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C Haman
o
Merge git://git2
.
kernel
.
org/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Merge br
a
n
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C Hamano
git-rebase:
make 'rebas
e
H
EAD br
a
nch' wor
k
as exp
e
cted
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio
C
Hamano
git-rev
-
list --bise
c
t: optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next