repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-am: do not fail if 3-way fallback succeeds.
2005-09-24
Junio C H
a
man
o
Use 0
.
99
.
7
.
GIT a
s
vers
i
o
n betwe
e
n 0
.
99
.
7 and 0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C
Ha
m
ano
Solaris:
g
iv
e
a
b
i
t more bui
l
t-in defaults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hama
n
o
Real
l
y ignore generat
e
d d
i
stribution mater
i
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
daemon
.
c:
p
id_t is
not int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
un
i
o
C
H
a
m
ano
Merge 'fixes
'
bra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Furthe
r
c
l
a
r
i
fy lic
e
nsing
s
t
a
tu
s
of
c
om
p
a
t
/
s
ubpr
o
cess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Hama
n
o
Ignore a bi
t
m
o
re generated
f
iles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
u
ni
o
C Hama
n
o
Mer
g
e branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
J
u
n
io C Ham
a
no
Make 'git diff --cached
'
syn
o
nym
o
u
s
to
'
git diff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
D
o
not
g
ive alarming
er
r
or message from rsync
in
fet
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Haman
o
Prett
y
p
r
i
nt
o
ctopus merge messag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o C Ham
a
no
R
etire diff-he
l
per
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retir
e
rev-
t
ree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C Ha
m
ano
Retire git-expo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Revert "
U
se
g
i
t
-
m
erge instead
of git-resolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Haman
o
R
ev
e
r
t "Make Octo
p
us mer
g
e
message a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Merge b
r
anc
h
'fixes'
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Ham
a
no
Fix do
c
umentation depend
e
ncy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Mak
e
object creation
i
n ht
t
p fetch
a
b
it safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
m
ano
C
l
arify dual l
i
cen
s
e stat
u
s of
s
ubprocess
.
p
y
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Up
d
ate tuto
r
ial with Octop
u
s
us
a
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make Octop
u
s merge
message a bit nic
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Use git-merge instea
d
of git
-
resolve
i
n git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
D
o
not give alarm
i
ng
error
m
essage
from rsync in fetc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
S
how
modified file
s
in git
-
ls-files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Fast-
p
ath 'upda
t
e-in
d
ex --refresh' a bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
un
i
o
C
Ham
a
no
Use G
E
COS field a bit better to
produce default hum
a
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
i
o C Hamano
D
ocu
m
en
t
-
i
flag to git-
r
ead
-
tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio
C Hamano
S
hip ou
r
own
c
opy of s
u
bprocess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
no
show
-
branc
h
: Be nicer when running
i
n a c
o
rrupt re
p
ository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Arrgh
-- another asciidoc caret
w
orkaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Docu
m
ent extended SHA1 use
d
by g
i
t-
r
ev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
Ham
a
no
fetch
(
) assumes we do
n
o
t
h
ave the object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Me
r
g
e
branch 'ma
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C Hamano
Improve the safety check
used in fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
mano
Archive-de
s
troying "
g
it re
p
ack -a -d" bu
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio C Ham
a
no
Do not fail after call
i
ng bisect
_
aut
o
_ne
x
t()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Fix typo in test comment
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C Hamano
[PAT
C
H
]
ge
t
domainn
a
me
should be usa
b
l
e
on SunOS with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
i
o
C Ha
m
a
n
o
Add git
-
send-email to
.
g
itign
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Ha
m
a
no
T
each rsync transport a
b
out alternates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
u
n
io C
Hama
n
o
[
P
ATCH] fetch
.
c:
cleanups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
unio C Hamano
[P
A
TC
H
] Make git-checkout
failure message more friendl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Ha
m
ano
Re
c
ommend 'less' for Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C
Hamano
Revert breakage introdu
c
ed by c80522e30fdc190f8c8c7
f
c983b
b
e0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
Pl
u
g diff leaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hamano
Avoid wa
s
tin
g
me
m
ory while
keeping track
o
f what we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Be mo
r
e b
a
ckward compatibl
e
with git-ss
h
-{pu
s
h,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C Hama
n
o
Unoptimize in
f
o/
r
efs creation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
unio
C
Hamano
Reti
r
e info
/
rev-cache
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Ha
m
ano
g
i
t
-branch
-
d <branch>: delete unused
b
r
anch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Hamano
R
ev
e
rt "[PATC
H
] plug memory leak
i
n d
i
ff
.
c::diff_
f
re
e
_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hama
n
o
Make
me
r
g
e comment git-pull ma
k
es for a
n
octopus a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Haman
o
M
erge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
io C
H
a
m
ano
read-tre
e
:
fix bogus debugging statemen
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
i
o C Hamano
git-m
e
rge-recursive: Trivial RE fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
[PATCH]
D
e
f
ine relative
.
git/
o
bjects/inf
o
/
a
l
ternates
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hama
n
o
Detect
l
s-remo
t
e fai
l
ure pr
o
per
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix off-by-one error in gi
t
-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
Propagate errors from fetch-pack correctly
t
o
git-fetc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix CDPAT
H
problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
un
i
o
C Hamano
Merg
e
b
r
an
c
h
'
m
aster' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Haman
o
Documen
t
git-
g
rep and
l
ink it from
th
e
m
a
i
n
git(7
)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C H
a
mano
[
PATCH] Make 'git c
h
eckout' a bi
t
more forgiv
i
ng when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Hamano
[PATCH]
Omit
patches
that
h
ave already b
e
en merge
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o
C Ham
a
no
Allow finding things
t
ha
t
begin
with a dash in 'g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Merge branch '
m
aster' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C
Hamano
Use int
i
nste
a
d o
f
socklen_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
a
no
Pre
p
a
re
0
.
99
.
7 releas
e
candidate
branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C
Ha
m
a
n
o
Add
a
new mer
g
e s
t
rategy by Fr
e
drik K
u
ivine
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
H
amano
'git-merge': Do
c
umentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Use Dani
e
l
'
s read-tr
e
e in the me
r
ge strategy 'resolve
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Multi-ba
c
kend merge
driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
H
amano
Plug le
a
k
in Daniel'
s
read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
a
n
o
[PATCH] A
d
d
d
ebugg
i
ng help
for case #16 to read-tree
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
[
P
A
TCH]
D
isable debugging from read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Fix 'g
i
t-sh
o
w-branch --l
i
st <head>
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ha
m
ano
Add 'git bisec
t
replay/l
o
g' documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
K
e
ep bisection
l
og so that i
t
can
b
e rep
l
ayed
later
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Jun
i
o C Hamano
Fix
c
op
y
mark
i
ng from d
i
ffcore
-
rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
H
amano
Mak
e
sure we have le
a
ding
d
irectories under
r
ef
s
/
{heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
amano
s
how-branch: --list an
d
--independ
e
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Re
t
i
r
e
support fo
r
o
ld en
v
iron
m
ent
variables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ha
m
ano
Adjust
.
gi
t
ignor
e
for big rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Ham
a
n
o
Ignore datestamp-only
c
han
g
e
s
wh
e
n
i
nstal
l
ing webdo
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
Ha
m
ano
Squelch `removal' me
s
sage fro
m
'git
r
e
set --
h
ar
d
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
a
man
o
'build' scrip
t
s be
f
ore instal
l
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
J
u
n
io C Hamano
Show
a
l
l
merge-base cand
i
dates from show-branch --merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
Hamano
D
ocumentati
o
n updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
git --
v
er
s
ion tells which version of git you have
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
H
amano
Big tool
rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
i
o C Hama
n
o
GI
T
0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
Junio C
H
am
a
no
Doc
u
m
e
ntation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hama
n
o
Docume
n
tation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
J
u
n
i
o
C Hamano
Flatten to
o
ls/ dir
e
ctory to make b
u
i
l
d
pr
o
cedure
simpler
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Haman
o
mailinfo: barf
and exist u
p
o
n n
e
sted
mult
i
part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Me
r
ge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-06
Junio
C
H
amano
Format fi
x
for
a
s
c
i
i
do
c
docu
m
entati
o
n titles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Ha
m
ano
Merge
b
ranch
'
master' of
.
commit
|
commitdiff
|
tree
next