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
D
o
c
u
m
enta
t
ion
:
add g
i
t
-
m
e
rgetool to the command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Hamano
Mer
g
e branch
'
master' of git://repo
.
or
.
cz/git/mer
g
e
tool
commit
|
commitdiff
|
tree
2007-03-13
Ju
n
io C
Hama
n
o
Merge branch '
m
aster' of git:/
/
rep
o
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Merge
bra
n
ch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-03-13
Ju
n
io C Hamano
M
e
rge branch 'm
a
ster' of git:/
/
r
epo
.
or
.
cz/g
i
t/fastimport
commit
|
commitdiff
|
tree
2007-03-13
Juni
o
C Ham
a
n
o
M
e
rge branch 'maint' o
f
git:
/
/repo
.
o
r
.
cz/gi
t
/fastimp
o
rt
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C
Hamano
Merge b
r
anch
'
main
t
' of gi
t
://repo
.
o
r
.
cz/gi
t
-g
u
i into
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C H
a
mano
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge branch
'jc/bo
u
ndary'
commit
|
commitdiff
|
tree
2007-03-11
J
u
nio C Hamano
Merge branch 'j
s
/attach'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
Ham
a
no
Merge branch 'js/diff-n
i
'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C H
a
mano
M
e
rge b
r
anch 'jc/fsck'
commit
|
commitdiff
|
tree
2007-03-11
Ju
n
io C H
a
mano
Merge bran
c
h 'p
b
/commit-i'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge branch 'js/rev
e
rt-cherry'
commit
|
commitdiff
|
tree
2007-03-11
Ju
n
io C Hamano
Merge
branch 'sp/make'
commit
|
commitdiff
|
tree
2007-03-11
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge branc
h
'
m
aint' of git://linu
x
-nfs
.
org/~
b
f
i
e
l
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Junio C Hamano
Merge branch
'js
/
c
onfig
-
re
n
ame'
commit
|
commitdiff
|
tree
2007-03-08
Junio C Hamano
Merg
e
branch 'master' of
git
:
/
/
repo
.
or
.
cz/gi
t
/fastim
p
ort
commit
|
commitdiff
|
tree
2007-03-07
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
re
v
ision --bou
n
d
ary: fix uncounte
d
case
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
i
o
C H
a
mano
revision --
b
oundar
y
: fi
x
stup
i
d t
y
po
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Haman
o
git-bundle
:
m
ak
e
veri
f
y
a
b
i
t
m
ore
c
hatty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio C
Hamano
r
e
vision t
r
aversal: SHOWN means shown
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Jun
i
o
C Hamano
git-bun
d
l
e: various f
i
x
ups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
i
o
C
Ha
m
ano
r
evision travers
a
l: retire BOUNDARY_SHOW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C
H
a
mano
r
e
vision wal
k
er: Fix --boundary when limited
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-03-06
J
u
ni
o
C Hamano
Merge br
a
n
c
h
'master' of
git://rep
o
.
or
.
cz
/
git-g
u
i
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio
C Haman
o
git-
b
undle
:
fix pac
k
generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
u
ni
o
C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio
C
Hamano
git-commit:
cd to top b
e
for
e
showing
the final stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch 'm
a
s
t
er-for-junio' of
git
:
//repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
io C Hamano
Merge
b
ranch
'ma
i
nt-
f
or-junio' of git:
/
/r
e
po
.
o
r
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
fsck: exit with
non-zero status upo
n
errors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio C Ha
m
an
o
unpac
k
_sha1_file(): det
e
ct co
r
rup
t
loose object files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio
C Hamano
fsck: fix bro
k
e
n
loose object chec
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Jun
i
o C H
a
mano
Po
s
t
1
.
5
.
0
.
3 clean
u
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
form
a
t-p
a
tch --at
t
ach: not folding some long headers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
J
unio C Ha
m
a
n
o
Mer
g
e branch
'
j
s
/fetch-p
r
ogress'
(earl
y
part)
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Merge b
r
anch 'js/symlink'
commit
|
commitdiff
|
tree
2007-03-05
J
unio
C Haman
o
Mer
g
e
branch '
m
ain
t
'
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
Junio C H
a
mano
diff-n
i
: fix the diff with standard input
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C
Hamano
dif
f
-ni:
allow running from a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio
C H
a
mano
Merge branch 'j
s
/d
i
ff-
n
i' (early
p
art)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-03
J
u
n
i
o
C Hamano
g
it-me
r
ge: fail correctly when w
e
c
annot fa
s
t forward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
J
u
n
io C Hamano
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-03-02
Junio
C
Hama
n
o
Merge
b
ranch '
j
s
/commit-fo
r
mat'
commit
|
commitdiff
|
tree
2007-03-02
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
J
u
n
i
o C Hamano
Add r
e
c
ent ch
a
nges to dr
a
ft
1
.
5
.
1 release no
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ham
a
n
o
Me
r
g
e
b
ranch
'js/c
o
mmit-
b
y-name'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'js/bundl
e
'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C
Hamano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Start preparing
Rel
e
ase Not
e
s for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Do
c
umentation: git-remote add
[
-t <
b
ranch>] [-m <b
r
anch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
i
o
C
Hamano
ind
e
x_fd(): con
v
e
r
t
b
l
o
b only if it is a r
e
gula
r
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio C
Hamano
in
d
e
x_fd
(
)
: pass optional pat
h
par
a
me
t
er as
h
i
n
t
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
ind
e
x_f
d
(): u
s
e
enu
m
object_type
instead of t
y
pe na
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Me
r
ge branch 'np/types'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Haman
o
Merge
branch 'mc/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Ham
a
no
M
erge
branch 'js/diff-n
i
' (
e
arly part)
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C
H
ama
n
o
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-27
J
uni
o
C H
a
mano
Mak
e
'cvs
ci' lockless in git-cvss
e
rv
e
r
b
y using git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
J
unio C Hamano
Merge br
a
n
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-27
Junio C H
a
m
ano
g
i
t-apply:
do
n
o
t f
i
x
whitespaces on context lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Hamano
Merge
b
ranch 'maste
r
' in
t
o js/dif
f
-ni
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
Do
c
u
mentatio
n
:
link in 1
.
5
.
0
.
2 mate
r
ial
to t
h
e top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch
'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
Junio
C
Hamano
D
o
cumentat
i
o
n
:
describe
"-f
/
-t
/
-m"
op
t
ions
t
o "
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio
C Ha
m
ano
diff --cc: fix display of
symlink co
n
flicts durin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Hamano
M
e
rge
branch
'
jc/mer
g
e
-
s
y
mli
n
k
' into maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge-recursive:
fix lon
g
s
t
andin
g
bug in mer
g
i
n
g sym
l
inks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
Ham
a
no
merg
e
-in
d
ex:
fix longstand
i
ng bug in
m
e
r
g
i
ng symlin
k
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
diff --cached: gi
v
e more sensibl
e
error message when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
n
i
o C
Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-02-25
J
u
n
io C Hamano
Add Relea
s
e Notes to prepare for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Hamano
rere
r
e:
do not deal
w
ith symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Hamano
rerere: do not ski
p
two con
f
lic
t
e
d
p
aths
n
ext to
e
ach
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Merge git://repo
.
o
r
.
cz/git-gui i
n
to maint
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Hamano
Don't modify CREDITS-
F
I
LE if it
h
as
n
'
t
changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
Evil Merge branch 'jc/
s
t
atus'
(
e
a
rly part) int
o
js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
M
e
rge branch
'
js/appl
y
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
Mer
g
e branc
h
'js/no-limit-
b
oundary'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
Merge branch 'js/etc-config'
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-24
J
unio
C
H
a
man
o
di
f
f-patch: Avoid
e
m
itting double-slashes in
t
extual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
unio
C
Hamano
bundl
e
:
r
eword mis
s
ing prereq
u
isite err
o
r message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Reword git-am 3-way
f
allback failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio
C
Hamano
.
m
a
i
lmap mai
n
tenan
c
e after pul
l
i
n
g from git-
s
vn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
amano
Merge br
a
n
c
hes 'lt/
c
rlf' and 'jc/apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
amano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C
Hamano
r
u
n_diff_{
f
iles,in
d
ex}():
u
pda
t
e cal
l
ing
c
onvention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C H
a
mano
updat
e
-in
d
ex: d
o
not d
i
e too ear
l
y in a read-only r
e
pository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C H
a
mano
git-s
t
atus: do not be totally
u
seless
in a read-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io
C Ham
a
no
t411
9
: test autocom
p
uting
-p<n> fo
r
traditio
n
a
l
diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
Hamano
git-apply: guess
c
orrect
-
p
<
n> value
f
o
r non-
g
it
patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next