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
Fix overzealous cleanliness check in git-merge
2005-09-27
Junio
C
H
a
mano
Fi
x
overzeal
o
us cl
e
anl
i
nes
s
c
h
eck
i
n git-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
io C Hamano
g
it-clone: check ou
t
"master" by default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Junio
C Ham
a
n
o
Plug a small ra
c
e in upd
a
te-ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C
Hamano
Dif
f
:
-
-n
a
me-st
a
tus output format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C
Hamano
Diff: -l<num> to limit r
e
n
a
me/copy dete
c
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Dif
f
clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hama
n
o
M
erg
e
branc
h
'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hama
n
o
Clean generate
d
files a bit mo
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hamano
Stop installing the backward compa
t
ible symli
n
ks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C
H
amano
show-branch:
fix comm
i
t
naming brea
k
age
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
git-grep: fix 'git grep -e
$
pattern' handl
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Remove use
of 'xargs -0' from gi
t
-reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Haman
o
Use
0
.
99
.
7
.
GIT
a
s versio
n
be
t
ween 0
.
99
.
7
and
0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
Solaris: give a bit more built-i
n
defaul
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io
C
Hamano
Reall
y
ig
n
ore gener
a
t
ed
d
is
t
ribution m
a
terial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Ham
a
no
daemon
.
c
:
p
i
d_t is not
int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
Merge '
f
ix
e
s
'
branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Haman
o
Further
clari
f
y lice
n
si
n
g status of c
o
mpat/subprocess
.
p
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Ignore a bit more
g
e
nerated file
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io C Hamano
Merge bran
c
h 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio
C Hamano
M
a
ke 'gi
t
diff --ca
c
hed' synonymous to 'gi
t
diff
-
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
a
mano
Do not give alarming error messa
g
e from rs
y
nc in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Prettyprint o
c
t
o
pus merge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Juni
o
C Hamano
R
etire diff-h
e
lper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
Hamano
Retire rev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire
g
i
t-export
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Hamano
Revert "U
s
e gi
t
-merge inste
a
d of git-re
s
olve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C Hamano
Rever
t
"Make Octopus merge message
a
bit
n
i
c
er
.
"
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
M
erge bra
n
ch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
a
no
Fix document
a
ti
o
n
d
ep
e
ndency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
mano
Make object cr
e
ation
in h
t
tp fetc
h
a bit saf
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
uni
o
C
Hamano
Clarify dual license
s
tatu
s
o
f
subprocess
.
py file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update tutorial
w
i
th Octopus usa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Mak
e
O
c
t
opus merge message a
bi
t
nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use git-merge instead of
g
it-resolve
i
n git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not give
a
larmi
n
g error message fr
o
m r
s
ync i
n
fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Haman
o
S
h
ow
modifie
d
files in git-ls-files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ha
m
a
n
o
Fast-path 'update-index --re
f
resh' a
bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Us
e
GEC
O
S
fiel
d
a bit better to produce default human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
Doc
u
ment -i fl
a
g
t
o g
i
t
-
read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hama
n
o
Ship
o
u
r own co
p
y o
f
s
u
b
pro
c
ess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show
-
b
r
a
n
ch:
B
e
nicer when running in
a
corrupt repository
.
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 Ha
m
ano
Arrgh -- another asciidoc caret workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Do
c
ument e
x
te
n
ded SHA1 used by git-rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
Hamano
fetch() assumes we do no
t
have
the object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio
C
Ha
m
ano
Merge
b
ranch 'mast
e
r
'
of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio
C H
a
ma
n
o
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 Hamano
Archive-destroy
i
ng "g
i
t rep
a
ck -a
-
d
"
bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Do not
f
ail af
t
er calling bis
e
c
t
_a
u
to_next()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
unio
C
Hamano
Fix typo in
test comme
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o C Hamano
[PATC
H
]
getdoma
i
nname should be usable on Su
n
OS with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Add
g
it-send
-
em
a
il t
o
.
gitig
n
ore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C Haman
o
Tea
c
h rsync tran
s
port
a
bout alt
e
rna
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C
Hamano
[
P
A
TC
H
] fe
t
ch
.
c: clean
u
ps
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hama
n
o
[
PATCH] Make gi
t
-checko
u
t failure mes
s
age
more
friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
Recommend 'less' for Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C H
a
man
o
Rever
t
b
reakag
e
intro
d
uce
d
by c805
2
2
e
30fdc190f8c8c
7
fc9
8
3
b
b
e
0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Plug diff leaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
A
void
wasting memory while keeping track of what we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
H
amano
Be more b
a
ckward c
o
mpatible with
g
it-s
s
h
-{push,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hama
n
o
Unoptimize inf
o
/ref
s
creation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
mano
Retire info/rev-cach
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
a
mano
git-bra
n
ch
-d <branch>: delete u
n
used b
r
a
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C
Ha
m
a
n
o
Revert "[
P
ATC
H
] plug
m
emory le
a
k in diff
.
c::
d
iff_fr
e
e_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
io C Hamano
M
ake mer
g
e
comme
n
t
git-
p
ull
m
akes for an
o
ctopus
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Hamano
Merge branch
'
m
a
ster' of
.
commit
|
commitdiff
|
tree
2005-09-14
J
u
n
io C Hamano
read-tree: fix bogus d
e
bugg
i
ng statemen
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Hamano
g
it-merge-re
c
ursi
v
e: Tri
v
i
al RE fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Define relative
.
git/objects/info/a
l
te
r
nate
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
Det
e
ct ls-remote failure prop
e
r
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Ha
m
a
no
Fix off-by-one error
in
g
it-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
n
i
o C Hamano
Pro
p
agate errors from f
e
tch-pack
c
o
r
rectly to git-
f
etch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
F
i
x CDPATH proble
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C
Hamano
Merge branch 'ma
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
Docum
e
nt git-
g
re
p
and link
i
t from th
e
main git(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
un
i
o C Hamano
[PATCH] Make 'gi
t
checko
u
t' a bit more forgiving when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
[P
A
T
CH] Omit patches that have already been m
e
rged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
J
unio C Hamano
Allow finding things that begin with a
d
ash
i
n 'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio
C
Ham
a
no
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C
H
ama
n
o
Use int ins
t
ead of soc
k
len_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Prepare 0
.
99
.
7 rele
a
se candidate bran
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hama
n
o
Add a new merge strategy by
F
redr
i
k
K
u
i
vinen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
'git-merge': D
o
cument
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
H
a
m
ano
Us
e
Daniel's re
a
d-tree in the merge strategy 'resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Multi-backend merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
P
l
ug leak
i
n Daniel's read-tr
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C
Hama
n
o
[PATCH]
Add debugging help f
o
r
ca
s
e
#1
6
t
o read-tree
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[
PATCH]
Di
s
a
ble debugging fro
m
read-tre
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C H
a
mano
F
i
x
'git-show-
b
ran
c
h --list
<hea
d
>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ham
a
no
A
d
d
'git bisect repla
y
/log
'
documentati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Jun
i
o C Hamano
K
eep bise
c
t
i
on
l
o
g
s
o that it can be rep
l
ayed
l
ater
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ha
m
ano
F
i
x copy ma
r
king from diffcore-rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hama
n
o
Make sure we
h
a
v
e lea
d
ing
d
irecto
r
ies under refs/
{
heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
n
i
o
C Hamano
s
h
ow-br
a
nch: --list and --indep
e
n
d
e
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Retire sup
p
ort for o
l
d environment v
a
r
iable
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
A
d
just
.
gitignore for big ren
a
me
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio
C
Hamano
Ignore dates
t
am
p
-only
c
hanges when
installing webdoc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
unio C
H
amano
Squ
e
lch `removal' message from
'git
r
eset --hard'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C H
a
mano
'build'
scripts bef
o
re insta
l
l
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next