repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-merge instead of git-resolve in git-pull.
2005-09-21
Jun
i
o C H
a
m
a
no
Use git-merge instead of git-resol
v
e i
n
git-p
u
ll
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
Do not g
i
ve alarming er
r
or mess
a
ge fr
o
m
r
sync
in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
no
Show mo
d
ified files in git-ls
-
files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio
C Hamano
Fast-path 'update-in
d
ex --refresh
'
a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
n
io C Ham
a
no
U
se GECO
S
field a
bit better to produce d
e
fault
h
uman
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
D
o
cument
-i
flag to git-rea
d
-
t
ree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
S
h
i
p
o
u
r
own copy of subproc
e
s
s
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
n
io C Haman
o
s
h
o
w
-
branch: B
e
nicer when run
n
ing in a
c
or
r
upt re
p
ository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
GIT 0
.
9
9
.
7
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io
C
Hamano
Ar
r
gh -- a
n
other asciidoc
c
a
ret w
o
rkaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
man
o
Docum
e
nt extende
d
SHA1
used by git
-
rev-
p
arse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
fetch() assumes
w
e do not h
a
ve the
o
bject
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C Hamano
M
e
r
g
e
b
ranc
h
'mas
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Imp
r
ove the
s
afety c
h
e
c
k
used in fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Ha
m
a
n
o
A
rchive-destroying "git repack -a
-
d" bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio C Ha
m
ano
Do not fail after c
a
lling b
i
sect_au
t
o_next()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
F
i
x typo in test comment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Hamano
[PATCH] getdomainname should
be
u
s
ab
l
e
o
n
S
unOS w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
A
dd git-send-email to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
n
i
o C Hamano
Teach
rsy
n
c
transport about alte
r
nates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o
C Hamano
[PATCH] fetch
.
c: cleanu
p
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C Hamano
[PAT
C
H]
M
ake gi
t
-checkout fa
i
l
ur
e
message m
o
r
e
f
riendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
Hamano
Recommend 'less
'
for De
b
ian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hamano
Revert breaka
g
e in
t
ro
d
uced
b
y c80522e30f
d
c1
9
0
f8c8c7fc983
b
be0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Haman
o
P
l
ug diff le
a
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
ano
Av
o
id wast
i
ng memory
while keeping tr
a
ck
o
f
w
hat we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Haman
o
Be more
b
a
ckward compat
i
ble with git
-
ssh-{pu
s
h,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
amano
Unopt
i
mize info/refs
c
r
eati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
n
i
o C Hamano
Re
t
ire i
n
fo/rev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Ha
m
a
no
git-branch -d <br
a
nch>
:
delete unused bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ha
m
ano
Revert "[PATC
H
] p
l
ug memory leak in di
f
f
.
c:
:
diff_fre
e
_
f
ilepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
io
C Hamano
Make merge
comme
n
t g
i
t
-pull makes for an
o
c
t
opus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio
C
Hamano
Me
r
ge b
r
anch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
i
o C Hamano
re
a
d-tree: fix b
o
gus debugging s
t
atement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
Ham
a
no
g
it-
m
e
rge-r
e
cursive
:
Trivi
a
l R
E
fixe
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Hamano
[
PATCH] Define relative
.
git/objects/i
n
fo/a
l
ternates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
un
i
o C Ham
a
n
o
Detect
l
s-remo
t
e
f
ailure prop
e
r
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C
Hamano
F
ix off-
b
y-
o
ne error in
g
it-
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C
H
amano
Propagate erro
r
s from fetch-pack corre
c
tly to git
-
fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
n
io C Hamano
Fix CDPATH
p
r
oblem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
Merg
e
branch 'm
a
s
ter'
o
f
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
a
no
Do
c
ument git-g
r
ep and link it from
t
he ma
i
n git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
[PATCH] Make
'git checkout'
a
bit
m
ore for
g
i
v
in
g
w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C
Hamano
[PAT
C
H
] Omit patches
t
ha
t
have al
r
eady be
e
n merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C H
a
mano
Allow
f
in
d
ing things that begin with a d
a
sh in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Merge branch 'master
'
o
f
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Ha
m
ano
Use
i
n
t instead of
s
o
c
klen
_
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Prepare
0
.
99
.
7 release cand
i
da
t
e branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
Hamano
Add a n
e
w mer
g
e str
a
tegy b
y
F
redrik Ku
i
vine
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio
C
H
am
a
no
'g
i
t-merg
e
': Documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
H
a
ma
n
o
Use Daniel's read-tr
e
e in
the m
e
rge stra
t
egy 'reso
l
ve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C
H
ama
n
o
M
u
lti-bac
k
end merge
d
river
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
Plug leak
in Daniel's
rea
d
-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ham
a
no
[PATCH] Add debugging help for case
#
16
to read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C Ha
m
a
no
[
PAT
C
H] Disable debuggi
n
g fr
o
m read-tr
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
F
i
x 'git-sho
w
-branch
--list <he
a
d>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio
C
H
a
mano
Add 'git bisect re
p
lay/log' do
c
umentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio
C Haman
o
Keep b
i
section l
o
g so
that
i
t can be replayed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C Ham
a
no
Fix copy ma
r
king from di
f
f
c
or
e
-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C Hamano
Make
sure we have le
a
ding dire
c
tories under
refs/{
h
e
ads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Ha
m
ano
show-branch: --list an
d
--independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
n
i
o
C
Hamano
R
e
tire support for old environ
m
ent
vari
a
b
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
Hamano
Adjus
t
.
gi
t
ignor
e
f
o
r big rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hama
n
o
I
g
nor
e
datestamp-o
n
l
y
change
s
when installing we
b
doc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C H
a
mano
Squelch `removal' message from 'gi
t
re
s
e
t -
-
hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C H
a
mano
'build' scr
i
pts before installing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Show al
l
merge-
b
as
e
cand
i
dat
e
s
f
rom
s
h
ow-
b
r
a
nch --mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C Ham
a
no
Docu
m
entation upd
a
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io C
Hamano
git --v
e
rsio
n
tells
w
h
i
ch version of git you have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Ha
m
an
o
B
i
g tool rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Jun
i
o C Hamano
GIT 0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
Junio C
H
amano
D
o
cume
n
tation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Documenta
t
i
on updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Fl
a
tt
e
n tools/ direc
t
ory to make build proce
d
ure simp
l
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
J
u
n
io C
Hamano
mailin
f
o: barf and exist upon ne
s
t
e
d multipa
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Jun
i
o C H
a
m
ano
Me
r
ge branch 'm
a
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-06
Junio
C Ham
a
no
Fo
r
mat fix for ascii
d
o
c documentati
o
n titles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ju
n
io C H
a
mano
Merge
branch
'master' of
.
commit
|
commitdiff
|
tree
2005-09-05
Juni
o
C Ham
a
no
Retire git-clone-dumb-h
t
t
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
uni
o
C Haman
o
I
nstall archimport-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
u
ni
o
C
H
ama
n
o
Merge branch 'maste
r
'
of
.
commit
|
commitdiff
|
tree
2005-09-04
Juni
o
C
Ha
m
a
n
o
Add copy/rename che
c
k
f
or g
i
t-apply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
unio C Hamano
Add a link
f
ro
m
update-server-info
documenta
t
i
on to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio
C H
a
m
a
no
git-applym
b
o
x: fix '-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Junio C Hamano
D
o
cument hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C H
a
ma
n
o
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C Ham
a
no
Mention post-
u
pdate w
h
e
n
we f
i
rst talk about publis
h
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Ju
n
io C Ham
a
no
scrip
t
s: equali
t
y
t
e
st '==' is not po
r
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio
C
Ha
m
an
o
gi
t
-checkout-s
c
ript: Remove unneces
s
ary variable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Jun
i
o C Hamano
Fix a
u
tomerge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
A
d
d repository-layou
t
document
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
J
u
n
io C
H
amano
M
e
r
g
e refs/heads/ma
s
ter
f
rom
.
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
Use 'git status
'
now i
t
ca
n
handle initial commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C H
a
man
o
F
ix
g
it-status
w
hen H
E
AD is in
v
alid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
J
u
nio
C
Ha
m
ano
Fix gi
t
-lo
g
-script w
h
en HE
A
D i
s
invalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio
C Haman
o
Add Pine 4
.
63 he
l
p
f
rom Daniel
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
Merge refs/heads/mas
t
e
r
from
.
commit
|
commitdiff
|
tree
2005-08-31
Junio
C Hamano
Update tuto
r
ial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
s
h
ow-b
r
a
nch: m
a
ke
i
t w
o
rk in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio
C Hamano
Merge refs/heads/
m
ast
e
r from
.
commit
|
commitdiff
|
tree
next