repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "Use git-merge instead of git-resolve in git-pull."
2005-09-21
Juni
o
C
Hamano
R
e
vert "Use git-merge
i
ns
t
ead of g
i
t-resol
v
e in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Make Octopus m
e
rge message a bit
nice
r
.
"
commit
|
commitdiff
|
tree
2005-09-21
Sergey
Vla
s
ov
[PATCH] fetch
.
c
: R
e
m
o
v
e
call to
pars
e
_ob
j
ect() fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey
Vl
a
so
v
[PATCH] f
e
t
c
h
.
c: Cl
e
an
up object flag de
f
inition
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ser
g
ey
Vlasov
[
PATCH] fetch
.
c: Remove redun
d
an
t
test
of TO_SCAN in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
PA
T
CH] fetch
.
c: Remove
s
ome dupl
i
cated code in proc
e
ss(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
r
gey
V
la
s
ov
[PATC
H
] fetch
.
c
:
R
emove redundan
t
TO_
F
ETC
H
flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vl
a
so
v
[PATCH]
fetch
.
c: R
e
move redund
a
nt SCANNED f
l
ag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rg
e
y Vlasov
[PA
T
CH] fetc
h
.
c
:
Make process(
)
look at ea
c
h
o
b
j
e
ct
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATC
H
]
f
etch
.
c: R
e
move useless look
u
p_object_t
y
pe
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Merge bran
c
h
'
fixes
'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
F
i
x doc
u
me
n
t
a
t
ion dependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Make object
creation
i
n h
t
tp fetch a bi
t
safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Cla
r
i
f
y
d
ual licens
e
s
t
atus of subprocess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
H
a
m
a
n
o
U
pdate tutorial
w
ith Octopus usag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
io C Hamano
Make Octopus merge mes
s
age
a
bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
aman
o
Use g
i
t-merge instead of git
-
resolve in g
i
t-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
L
inus Torvalds
Make time-based
commit filtering wo
r
k with topological
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
L
inus Torvalds
[PATCH] Te
a
ch "
g
it-
r
ev
-
parse" about dat
e
-based c
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
N
i
cola
s
P
i
tre
[
PAT
C
H
] ARM op
t
i
mized SHA1 implementation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Petr Baudis
[
PATCH] Make t
h
e g
i
t
-fsck-objects diag
n
ost
i
cs
more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not giv
e
alarming error m
e
ssage from rsync
i
n fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus
T
o
r
v
alds
[P
A
TCH] R
e
tur
n
pr
o
p
e
r
e
r
ror valud
from "par
s
e
_date(
)
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Show modified fil
e
s in git-ls-fil
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C H
a
m
a
no
Fast-path 'updat
e
-
i
ndex
--refresh' a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
U
se
GECOS fie
l
d
a bi
t
better
t
o
produce d
e
fault human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Docume
n
t
-
i
f
lag to
g
it-rea
d
-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Serge
y
Vlaso
v
[PATCH] Do
c
u
m
e
ntation: Update all
f
i
les to use
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Sergey
Vlasov
[PATCH] Documentation
:
Ad
d
asci
i
doc
.
conf file and gitlin
k
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
L
i
n
us To
r
valds
Fix extended short
SHA1 nam
e
c
o
m
pletion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C H
a
mano
Sh
i
p
our own copy
o
f
subproc
e
ss
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
a
mano
sho
w
-
b
ranch: B
e
nic
e
r
when
r
unning in a co
r
rupt reposit
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Pet
r
Baudis
[
PAT
C
H]
F
i
x git-i
n
it-db creating crap directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Patrick M
a
uritz
[PAT
C
H] Do not install
com
p
at
i
bility syml
i
nk for what
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus Torvalds
[
P
ATCH] Re
m
ove total confusion
from "git checkout"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-19
Linu
s
T
o
rvalds
[PATCH] strcasestr comp
a
tibility replacement
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
n
i
o C H
a
mano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C H
a
mano
A
rrgh -- another
a
sciidoc c
a
ret wor
k
a
rou
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
P
etr Bau
d
is
[
P
A
T
CH] Impr
o
ve git
-
u
pdate-
i
ndex error reporting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Linus Torvalds
[PATCH] Imp
r
oved "git add"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Linus T
o
rvalds
[PATCH]
Add "--gi
t
-dir" flag t
o
git-rev
-
parse
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Daniel Bar
k
al
o
w
[P
A
TCH] Su
p
por
t
alternat
e
s
a
n
d http-a
l
ternates in http
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ha
m
ano
Documen
t
extended SHA1
used b
y
git
-
rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
fetch() ass
u
mes we do not
h
ave the o
b
ject
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
M
erge branch 'mast
e
r
' o
f
.
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C
H
a
mano
Improve
t
h
e
safety check used in
f
etch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C
Hamano
Archi
v
e-destroying "git r
e
p
a
ck
-
a -d"
bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Haman
o
Do not fail
a
fter calling
b
is
e
ct
_
aut
o
_
n
ext()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Daniel Bar
k
a
l
ow
[PATC
H
]
Add support for alternates in HTT
P
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C
Ham
a
n
o
Fix typo in te
s
t
comm
e
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C Hamano
[PAT
C
H] get
d
omainn
a
me should b
e
usa
b
le on SunOS w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Linus Torvalds
[PAT
C
H] Make
"g
i
t
s
hortlo
g
"
u
nderstand raw logs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
L
i
nus Torv
a
lds
[
PATCH] Fix "git-re
v
-list" re
v
ision range parsing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C Hamano
Add git-send-email to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Teach rsync transport about alternates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Linus
T
orval
d
s
[P
A
TCH] A
v
oid buil
d
ing object ref
lists
w
hen
n
o
t n
e
e
d
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
L
inus Tor
v
alds
[PAT
C
H] Improve git-rev-list memory
u
sage fur
t
her
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hama
n
o
[PATCH] fet
c
h
.
c
: clea
n
ups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Matthias Urlichs
[PATC
H
] Debian: build-d
e
pend on "bc"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o C Ham
a
no
[P
A
TC
H
] Ma
k
e git-c
h
eckout fa
i
lure message m
o
re frie
n
d
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Chris Wright
[PA
T
CH] Upd
a
te git-core
.
s
p
ec
.
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
P
e
ter Hagervall
[PATCH] PATCH Do
c
u
m
e
ntation/git-rev-list
.
txt typo
fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
R
ec
o
mme
n
d 'less' for
D
ebian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
H
o
rst von
B
rand
[PA
T
CH] R
e
quire less in
RPM spec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C
H
amano
Re
v
ert
breakage in
t
roduced by
c
8
0
522e30fdc190f8c8c7fc983bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
jdl@free
s
cale
.
com
[PATCH]
D
ocumentation/git-re
v
-
l
i
st
.
t
x
t typo fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
L
i
nus Torvald
s
[PATCH]
R
e-o
r
ganize "git-rev-lis
t
--ob
j
ect
s
" logic
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
am
a
no
Plug diff leaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Hamano
Avoid wastin
g
mem
o
ry wh
i
le keeping track of
w
h
a
t we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Linus
Torv
a
lds
[PATCH
]
Avoi
d
wasti
n
g memory i
n
git
-
rev-list
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hamano
Be mo
r
e bac
k
ward compatible wit
h
git-ssh-{push,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
H
.
Peter Anvin
[
P
ATCH] rsh
.
c env and quot
i
ng
c
leanup, ta
k
e 2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
D
aniel Barkalow
[PATC
H
]
Fix fetch
c
ompleteness assumptions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Sergey Vl
a
sov
[
P
AT
C
H] Document git-fetch opt
i
o
ns
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
ano
U
noptim
i
ze info/refs creat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
a
n
o
Retire info/rev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Peter Eriksen
[PATC
H
] Use
'
-
d
'
a
s
the first
flag to 'install'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ser
g
ey Vlasov
[PATCH] git-h
t
tp-fetch: All
o
w
c
aching of retrieved
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
n
io C Hamano
git-branch -d
<
branch>: delete unused branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
uni
o
C Hamano
Rever
t
"[PATCH] plug
m
emory lea
k
in dif
f
.
c
:
:
diff
_
free_f
i
le
p
a
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Linus Torvalds
[PATCH] Fix
a
lloc_file
s
pec()
i
nitializat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
unio
C
H
a
m
ano
Make me
r
ge comment git-pull makes for an octopu
s
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C H
a
m
a
no
Merge
b
ra
n
ch '
m
aster
'
of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Haman
o
read-tree: fix
bogus
debu
g
gi
n
g state
m
ent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o C Hamano
git-merge-rec
u
rsive: Trivia
l
RE fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[PA
T
CH
]
U
se th
e
'die' function
whe
r
e it is app
r
o
priate
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PAT
C
H] Use a
t
emporary index file whe
n
w
e merge the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
rik
K
uivinen
[PATCH] Adju
s
t git
-
merge-
r
ecursive
.
py for the n
e
w
t
o
ol
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
i
n
en
[PATCH] Don't
o
utput 'A
u
tomatic m
e
rge failed,
.
.
.
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
K
uivinen
[PATCH] Be more like the '
r
es
o
lv
e
' strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
[
P
ATCH] Define relative
.
git/obj
e
cts/info/alt
e
rnates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
Detect ls-remote failure properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH] Rename the 'fr
e
drik' merge strategy to
'r
e
cursi
v
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix
off-
b
y-one e
r
ror in git
-
m
e
rge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Haman
o
Propagate
erro
r
s from fetc
h
-pack cor
r
ectly to g
i
t-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
an
o
Fix CD
P
ATH prob
l
e
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Ha
m
ano
Merge
b
r
anch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
D
ocument
git
-
grep and
link it from the
main
git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Ham
a
no
[
PATCH] Make '
g
it checkout'
a
b
i
t
m
ore f
o
rgivi
n
g wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
[
P
ATCH] O
m
it p
a
t
c
h
e
s
t
h
at have already bee
n
merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next