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
Merge branch 'maint'
2007-04-15
J
unio C Hamano
Fix 'crlf' attri
b
ute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Merge git:/
/
git2
.
k
e
rnel
.
org/pu
b
/scm/git
k
/
g
itk
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
H
amano
Teac
h
'diff'
a
bout 'di
f
f' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Define 'crlf' attrib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
A
d
d
b
asic
i
n
frastructure to assign attri
b
utes
to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Ha
m
ano
Rep
l
ace a pair of patc
h
es wit
h
updated
o
nes for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Do not def
a
ult to --no-index whe
n
g
i
v
en two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Ham
a
no
Merge branch '
j
c/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Ha
m
ano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix
g
it {lo
g
,sh
o
w,
.
.
.
} --p
r
ett
y
=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o
C Hamano
Documentation: --che
r
ry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ha
m
ano
git-l
o
g --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C Hamano
Ref
a
c
t
or patc
h
-id filterin
g
out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Ham
a
no
Add %m t
o
'--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
a
n
o
Merge 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
Jun
i
o C
Hamano
fsck: do not comp
l
ain
on
d
e
tached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge b
r
anc
h
'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
gi
t
-fetch:
u
s
e
f
etch--tool p
i
ck-rref
to avoid loca
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
git-f
e
tc
h
--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
no
t3030: merge-r
e
cursiv
e
backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
merge-rec
u
r
s
ive:
handle D/F conflict case more
c
arefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
m
e
rge-recursive: do not bar
f
on
"
to be remove
d
" entr
i
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
Treat D/F conflict entry more carefully in unpac
k
-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
1
0
00: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
ma
n
o
shortlog -w: m
a
ke wrap-line
behavi
o
ur optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
a
m
ano
Merge branch
'
j
c
/pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Merge br
a
nch 'j
c
/me
r
ge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
H
amano
Merge branch 'js/fetch-
p
rogres
s
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Ham
a
n
o
Merge branch '
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Ad
d
Docum
e
ntation/c
m
d-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cycle by
p
r
e
p
arei
n
g RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
a
man
o
Merge
b
r
anch '
j
c
/
read-tree-
d
f'
(
e
arly part
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Me
r
ge
b
r
a
nch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C
H
ama
n
o
Pre
p
are f
o
r 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ham
a
no
A ne
w
merge stragety
'subtr
e
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C Haman
o
git
-
push to mult
i
p
l
e l
o
cations
d
oes not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
git-push r
e
ports the
U
RL after fai
l
i
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C Hamano
Merge
b
r
anch
'
jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge br
a
nch '
f
p/ma
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Merge
b
ranch 'cc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
amano
Merge branch 'j
c
/checko
u
t'
(early part)
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Ha
m
a
n
o
Merg
e
bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
Documentation:
t
ighten depen
d
ency for
g
it
.
{
html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
gi
t
-bisect: all
o
w bisecting with only o
n
e
bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
t6030: add a bi
t
more tests
t
o
g
it-
b
isect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Haman
o
git-
b
isect:
modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Me
r
ge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Haman
o
Rename add_file_t
o
_index()
to
ad
d
_
f
ile_to_
c
ache(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C Hamano
R
e
n
ame static
v
aria
b
le writ
e
_index to update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename internal f
u
nct
i
on "add_fil
e
_
t
o
_cache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Ha
m
ano
Propagate
cache err
o
r
internal to refresh_cache
(
)
v
ia
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Fix bogus error messag
e
f
rom merge-recursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
F
ix dep
e
ndency o
f
common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
RPM spec: include
g
it-p4 in the
l
ist
of
all packa
g
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ham
a
no
rerere: ma
k
e
sortin
g
rea
l
ly
stabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix switching to a branch with D/F when
cur
r
e
n
t bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ham
a
no
F
i
x
twoway_merge that passed d/f conflict
m
arker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix re
a
d-tree --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-tree
s
:
g
e
t
rid of *indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ha
m
ano
u
npa
c
k
_
trees
.
c: pass unpack_trees_
o
ption
s
stru
c
tu
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
add_cache_en
t
ry(): remo
v
a
l of file
foo does not
c
onflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge br
a
nc
h
'j
c
/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge
branch 'fl/d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hama
n
o
Merge bra
n
ch
'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
b
ranch
'pos
t
1
.
5
.
1
/
tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ham
a
no
Merg
e
b
r
a
n
ch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hama
n
o
Merge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
a
n
o
git-read
-
tr
e
e
--ind
e
x-outp
u
t=<f
i
le>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
_GIT_INDEX_OUTPUT: all
o
w
p
lumb
i
n
g to
output to
a
n alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
checkout: allo
w
de
t
aching t
o
HEAD even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
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
H
a
mano
GIT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
am
a
n
o
rerere should not repeat t
h
e earlie
r
hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
u
nio C
H
amano
Hopefully fina
l
update t
o
the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
Hamano
Opti
o
nal
Tck/Tk: igno
r
e generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Ha
m
ano
D
o
no
t
both
e
r docum
e
n
t
i
n
g fetch-
-
tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C
H
amano
Upda
t
e d
r
af
t
release notes
f
o
r
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
unio
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch
'ma
s
ter'
o
f git://repo
.
or
.
cz/
g
it/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hama
n
o
D
ocumen
t
ation:
u
nbreak user-ma
n
ual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C Hamano
GIT 1
.
5
.
1
-
rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hama
n
o
Update main git
.
html page to point
a
t 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Me
r
ge branch
'
maint'
t
o synchronize
w
ith
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
F
i
x "--pretty=for
m
a
t
:
"
for p
a
rent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
man
o
git-commit: "re
a
d-tree -m HE
A
D"
i
s not the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C H
a
mano
sha1_file
.
c (write_sha1_file): Det
e
ct close
f
ailure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
H
amano
Docu
m
ent
git-log --f
i
rst-par
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ham
a
no
G
I
T
1
.
5
.
1-rc
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C
H
aman
o
Merge branch 'j
c
/fpl'
commit
|
commitdiff
|
tree
2007-03-26
J
unio C H
a
ma
n
o
Update README to point at a fe
w
key period
i
cal messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C H
a
m
a
no
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Hamano
Merge branch 'maint' of git://li
n
ux-nfs
.
o
r
g/
~
bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
e
rge branc
h
'j
s
/rem
o
te-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge
b
r
anc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-03-24
J
uni
o
C H
a
mano
git-am docu
m
entati
o
n: describe what
i
s take
n
fro
m
where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
m
ano
mak
e
the p
r
evi
o
u
s optimiza
t
i
on work also
on
pat
h
-
limi
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next