repo.or.cz
/
git
/
jnareb-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
H
a
mano
Documenta
t
ion: add g
i
t-m
e
rg
e
tool to the com
m
and list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Hamano
Merge branch 'm
a
s
t
er' of
git://repo
.
or
.
cz/git/me
r
g
e
t
o
ol
commit
|
commitdiff
|
tree
2007-03-13
J
u
nio
C
Hamano
Merge branch 'maste
r
' o
f
git://repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hama
n
o
M
erge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Merge branch 'master' of git:/
/
rep
o
.
o
r
.
cz/gi
t
/
f
astimport
commit
|
commitdiff
|
tree
2007-03-13
J
un
i
o
C Ham
a
no
M
erge br
a
nch
'maint' of git
:
//repo
.
or
.
c
z
/git/fasti
m
port
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C Haman
o
M
er
g
e
branch 'ma
i
nt' of git://re
p
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Jun
i
o C Hama
n
o
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge
b
ranch
'jc/boundary'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
amano
Merge branch 'js/attach'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Mer
g
e
branch 'js/diff-ni'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
Hamano
M
e
rge branch 'jc/fsc
k
'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
M
e
rge
b
r
a
n
c
h
'pb/commit-i'
commit
|
commitdiff
|
tree
2007-03-11
J
u
n
io C
H
am
a
n
o
Merge br
a
nch
'js/rev
e
rt-cherry'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge bran
c
h
'sp
/
ma
k
e'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
amano
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge b
r
anch 'main
t
'
of git://linux-
n
fs
.
o
r
g/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Juni
o
C H
a
ma
n
o
Mer
g
e
b
ra
n
ch
'
js/c
o
nfig-rena
m
e'
commit
|
commitdiff
|
tree
2007-03-08
Jun
i
o
C
Hamano
Merge br
a
nch
'
m
a
s
t
e
r'
o
f
git
:
/
/repo
.
or
.
cz/
g
it/fastim
p
ort
commit
|
commitdiff
|
tree
2007-03-07
Junio C Hamano
Merge
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Haman
o
revis
i
on --bounda
r
y: fix uncounted case
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ha
m
ano
revis
i
on
-
-
boun
d
ary: fix
stupid
t
y
p
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Jun
i
o
C
Hamano
git-bun
d
le:
m
ake verif
y
a
bit
more chatty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio
C
Ha
m
ano
r
e
vision t
r
aversal: SHOWN
m
e
a
ns shown
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
g
it-b
u
nd
l
e: vari
o
u
s
fixups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio
C
Hamano
revis
i
on tr
a
versal: reti
r
e BO
U
NDARY
_
SHOW
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio
C Hamano
revision walker: Fix --b
o
und
a
ry when limi
t
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge
b
ranch 'master' of
git://rep
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio
C Hamano
git-bundle: fi
x
pack generation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Hama
n
o
git-c
o
mmit: cd to top before showing th
e
f
inal stat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
J
unio
C
Hama
n
o
Mer
g
e
b
r
anch '
m
aster-for-jun
i
o' of
g
it://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Hamano
Merge branch 'maint-for
-
j
u
nio
'
o
f git://rep
o
.
o
r
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
f
sck: exit wit
h
non-zero s
t
atus upon errors
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
unpac
k
_sha1_file(): detect co
r
rupt l
o
ose object
f
il
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio
C Ha
m
ano
fsck: fix broken loose
o
bject check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Po
s
t 1
.
5
.
0
.
3
cl
e
anup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Ha
m
ano
format-patch --a
t
ta
c
h: not
folding
s
ome long h
e
aders
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C H
a
mano
Merge bran
c
h 'js/f
e
tch
-
progress' (
e
arly part)
commit
|
commitdiff
|
tree
2007-03-05
Juni
o
C Hamano
Merge branch '
j
s/symlink
'
commit
|
commitdiff
|
tree
2007-03-05
Juni
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-05
Junio
C
Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
u
n
i
o
C Hama
n
o
diff-ni: fi
x
t
he
diff with stan
d
ard input
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
u
nio C H
a
mano
d
i
ff-ni: allow running from a subdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
u
n
io C Hamano
Merge branch
'
js/dif
f
-
ni' (
e
arly part)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-03-03
J
unio C Haman
o
git-merge: fail correctly when w
e
cannot
fast f
o
rw
a
rd
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Junio C
H
amano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-02
Juni
o
C Ham
a
n
o
M
erge branch 'j
s
/commit
-
fo
r
mat'
commit
|
commitdiff
|
tree
2007-03-02
J
unio C Hama
n
o
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
Hamano
Ad
d
r
ecent changes to draft
1
.
5
.
1
release notes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hama
n
o
Merge branch
'
j
s/commit-by-name'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C Hama
n
o
Merge branch 'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
S
tart prep
a
ring
Release
Note
s
f
or 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Ha
m
ano
Do
c
umen
t
at
i
on: git-remote ad
d
[
-
t
<
bran
c
h>] [-m <b
r
anch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C Hamano
index_fd(): convert blob
o
nl
y
if
it is a regular file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
inde
x
_fd()
:
p
ass o
p
t
iona
l
path
parameter as
h
int
for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd():
u
se enum object_type i
n
st
e
ad of type n
a
m
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C H
a
mano
Merge b
r
anc
h
'np/types'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
i
o C Hamano
Merge branch '
m
c/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'js/diff-ni' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Mer
g
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-27
Ju
n
io C Hamano
Make '
c
vs ci' lock
l
ess
i
n git-cv
s
serv
e
r by using
git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio
C Hamano
git-appl
y
: d
o
n
o
t fix whitespaces on cont
e
xt lines
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C
Hamano
Merge branch
'mast
e
r
'
into js/diff-ni
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Ham
a
no
D
ocumentation: link in 1
.
5
.
0
.
2 mat
e
rial to the
top
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
GIT
1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio
C
Hamano
D
o
c
u
mentation:
d
escribe "-f
/
-t/-m" o
p
tions to "git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o
C Ham
a
n
o
diff --
c
c: fix display of symlink conflicts durin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge br
a
nch
'jc
/
merge
-
s
ymlink' i
n
to maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
ama
n
o
mer
g
e
-
recu
r
sive: fix longstanding bug in mer
g
i
ng s
y
ml
i
nks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge-index
:
f
ix long
s
tanding bug in mergi
n
g symlink
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio
C Hamano
diff --cached: give more sensible error me
s
s
age
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-25
Junio C Haman
o
A
d
d Release Notes to prepar
e
fo
r
1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
mano
r
erere: do n
o
t deal with s
y
mlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
unio
C Hamano
r
erere: do not skip two conflicted pat
h
s next
to ea
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio
C Hamano
Merge git://repo
.
or
.
c
z
/
g
it-gui
i
nto maint
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Ha
m
ano
Don
'
t
modi
f
y CREDI
T
S-FILE if it hasn't c
h
anged
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Ha
m
ano
Ev
i
l Merge bra
n
ch
'jc/st
a
t
us' (early part) into
j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C
H
amano
Merge branch 'js/
a
p
ply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
a
m
ano
M
e
r
g
e branch
'
js/
n
o-li
m
i
t-boundary'
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C Hamano
M
e
r
ge br
a
nch 'js/etc-config'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C Hamano
d
if
f
-p
a
tch: Av
o
i
d
emit
t
in
g
double-s
l
ashes in textual
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
b
undle
:
reword missing prerequi
s
ite e
r
ror message
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
H
a
mano
Rewor
d
git-am 3-way f
a
llback failure message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Ha
m
a
n
o
.
mai
l
map maintenance after p
u
lli
n
g
from git-svn
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
J
u
nio C Ha
m
ano
Merge branc
h
es '
l
t/c
r
lf'
and
'
jc/apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Ju
n
io C
Ham
a
no
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Ham
a
no
run_
d
iff_
{
files,index}(
)
: update calling convention
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C Ha
m
a
n
o
update
-
index:
do not die too earl
y
in a read-onl
y
rep
o
sitory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
H
a
mano
git-status: do
n
ot be
t
o
t
ally useless in
a
read-
o
nly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C Ham
a
no
t4119: test auto
c
om
p
uti
n
g -p<n> for tr
a
ditio
n
al
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
Hamano
git-ap
p
ly:
g
u
ess
correct -p
<
n> value for n
o
n-git p
a
tch
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next