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
Documentation: add git-mergetool to the command list.
2007-03-14
Junio C Hamano
Docu
m
ent
a
tion: add git-mer
g
etool
t
o
t
he
command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Juni
o
C H
a
mano
Merge branch
'master' o
f
gi
t
://re
p
o
.
or
.
c
z
/git/merget
o
ol
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hama
n
o
Merge branch 'ma
s
ter'
of git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-13
Ju
n
io C
H
amano
Merge branch 'm
a
ster
'
of git://repo
.
o
r
.
cz
/
git/fastimp
o
rt
commit
|
commitdiff
|
tree
2007-03-13
Junio C
H
a
mano
M
e
rge branch
'maint
'
of git
:
//
r
ep
o
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge
b
ranch 'maint
'
o
f gi
t
:/
/
r
e
po
.
or
.
cz/g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Ju
n
i
o
C Hamano
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-12
J
unio C
H
amano
Merge b
r
anch 'jc/boundary'
commit
|
commitdiff
|
tree
2007-03-11
J
unio C Hamano
Merge
b
r
anch 'js
/
at
t
ach'
commit
|
commitdiff
|
tree
2007-03-11
J
u
n
io C
Hamano
M
erge bran
c
h '
j
s/diff-n
i
'
commit
|
commitdiff
|
tree
2007-03-11
J
u
n
io C Hama
n
o
Merg
e
branch 'jc/fsck'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C H
a
man
o
Merge branch 'p
b
/commit-i'
commit
|
commitdiff
|
tree
2007-03-11
Juni
o
C Hamano
Merg
e
bran
c
h 'js/reve
r
t-cherry'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
Hamano
Merge
b
ranch
'
sp
/
m
ake'
commit
|
commitdiff
|
tree
2007-03-11
J
u
n
io C Ham
a
no
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Junio C H
a
mano
Merge
branch 'maint' of
git://linu
x
-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Ju
n
io C
H
amano
Merg
e
b
ranch 'js/config-rename'
commit
|
commitdiff
|
tree
2007-03-08
Ju
n
io C
Ham
a
no
Mer
g
e bran
c
h
'
master' of gi
t
://repo
.
o
r
.
c
z
/git/fastimport
commit
|
commitdiff
|
tree
2007-03-07
J
u
n
io C Hama
n
o
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
revi
s
ion --boundary: fix uncounte
d
case
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
r
e
vision --bounda
r
y: fix stupid typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Jun
i
o C H
a
ma
n
o
git-bundl
e
: make
verify a bit more cha
t
ty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio
C
Ham
a
no
r
evision traversal: SHOW
N
means s
h
own
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
git-b
u
ndl
e
: various fixups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Hamano
revi
s
ion traversal:
r
etire
B
OUNDARY_
S
HOW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Haman
o
rev
i
sion wa
l
ker: Fix
-
-boundary
w
hen
limited
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge bra
n
c
h 'master' of git
:
//repo
.
or
.
cz
/
g
it-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
git-bundle: fix pack gener
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Haman
o
git-c
o
mmit: cd to top before
s
ho
w
i
ng th
e
final stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
io C Hamano
Mer
g
e bra
n
ch 'master-for-junio'
o
f git://
r
epo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C
H
amano
Merge branch 'main
t
-for-juni
o
' of git://repo
.
or
.
c
z
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Haman
o
fsck: ex
i
t with
n
on-z
e
ro
statu
s
upon er
r
ors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio
C
Hamano
un
p
ack_
s
ha1_file(): detect corrupt l
o
ose
o
bject fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Jun
i
o
C Hamano
fsck: f
i
x broken loose obj
e
ct check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
i
o
C
H
amano
Post
1
.
5
.
0
.
3
cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio C H
a
ma
n
o
format-patch --at
t
ach
:
not
f
ol
d
i
ng some long he
a
ders
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio
C Hamano
Merge bran
c
h
'js
/
f
etch-p
r
ogres
s
' (early part)
commit
|
commitdiff
|
tree
2007-03-05
Junio
C Hamano
Merg
e
branch
'js/symlink'
commit
|
commitdiff
|
tree
2007-03-05
Juni
o
C
Hama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio C Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
d
i
ff-ni:
fix
t
he diff
w
ith standard in
p
ut
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
J
u
n
io C Ha
m
a
n
o
di
f
f-
n
i:
allo
w
running from a
s
ubdirec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
J
u
n
i
o C Hamano
Merge bra
n
ch '
j
s/
d
iff-ni' (
e
arly part)
commit
|
commitdiff
|
tree
2007-03-04
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-03
Ju
n
i
o
C Hamano
git-merge: fail
correc
t
l
y when
we cannot fast forward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-02
Junio
C
Hamano
M
e
rge b
r
anch 'js/commit-
f
orm
a
t'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hama
n
o
M
e
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Add recent ch
a
nges
to draft 1
.
5
.
1
r
elease notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge br
a
nch 'js/commit
-
b
y-name'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C Hamano
M
er
g
e
b
ranch 'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
Start pre
p
aring Rele
a
s
e
Notes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Documentat
i
o
n:
g
i
t-r
e
mo
t
e a
d
d [-t <
b
ranch>] [-m <branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hama
n
o
i
ndex_fd(): convert blob on
l
y
if
it i
s
a reg
u
lar fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
u
n
io
C
Hamano
index_fd(): pass
optional path pa
r
amete
r
as hint for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
index_fd
(
):
u
se enum obj
e
ct
_
type instead of
t
ype n
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ham
a
no
Merge
b
ranch
'
np
/
types'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Ham
a
no
Merge branch 'm
c
/
s
end
m
ail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Me
r
ge branch '
j
s
/
diff-n
i
' (
e
arly p
a
rt)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
M
ake 'cvs ci' l
o
ckless in git-cvsserver
by using gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-02-27
Jun
i
o C Hamano
g
i
t-apply: do
n
ot fix whitespac
e
s on context line
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch '
m
aster' into js/diff-ni
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Ha
m
ano
Documentation: l
i
nk in 1
.
5
.
0
.
2 material to the top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o
C Hamano
D
ocumentation: describe "-f/-t/-m"
options to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
diff --
c
c: f
i
x displ
a
y of s
y
mlink
c
onflicts
during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C H
a
mano
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Ham
a
no
Merge branch 'jc/me
r
ge-symlink' into maint
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C
Haman
o
m
e
rge-r
e
cur
s
ive:
f
ix lon
g
standing bug in me
r
ging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
m
erge-index: fi
x
longstandin
g
bu
g
i
n merging symlink
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Jun
i
o
C Ha
m
ano
diff --cached
:
give
more
s
ensible erro
r
mes
s
a
ge w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
ma
n
o
Add Release Notes to prepare for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Jun
i
o
C
Hamano
rer
e
re: do
n
ot deal wit
h
symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ham
a
no
rerere
:
do not skip two confl
i
cted
p
a
ths
next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
ano
Merge gi
t
://repo
.
o
r
.
cz/git-gui into maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
D
o
n
'
t modify CREDITS-FILE if it hasn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio
C
Hamano
Evil Merge bra
n
ch 'jc/status' (ea
r
l
y
part) into js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
Merg
e
bra
n
ch 'js/apply
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge b
r
a
n
ch
'js/no-
l
imit-boundary'
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
io C Hamano
M
erge br
a
nch 'js/etc
-
config'
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
i
o
C
Ham
a
no
dif
f
-patch:
A
voi
d
em
i
tting double-slash
e
s in textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hamano
b
undle:
r
ewo
r
d mis
s
ing prerequisite error
message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
R
e
word
g
it-am 3
-
way fallback failure messag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Ju
n
io C
H
ama
n
o
.
m
ailmap maintenance
after pul
l
ing from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Merge branches
'lt/
c
rlf' an
d
'jc
/
apply-c
o
nfig'
commit
|
commitdiff
|
tree
2007-02-23
Junio C H
a
mano
M
e
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
run_d
i
ff_{files,index}(): update ca
l
li
n
g conv
e
ntion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Juni
o
C Hama
n
o
u
p
date-
i
ndex: do not die t
o
o early in a read-only rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
n
io C
H
amano
git-status: do not be tota
l
ly useless in a read-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C Hamano
t4
1
1
9: tes
t
autoc
o
m
puting -p<n> for traditi
o
nal diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
git-apply: guess correct -
p
<n> val
u
e for n
o
n
-g
i
t
p
atche
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next