repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Use a temporary index file when we merge the common ancestors.
2005-09-13
Fredrik Kuivine
n
[PAT
C
H] Use
a tem
p
or
a
r
y
index
f
ile
whe
n
we merge the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Adjust git-merge-recursive
.
py for the new tool
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
uivin
e
n
[PATC
H
]
Don't output
'Auto
m
atic merg
e
fa
i
led,
.
.
.
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
u
i
vin
e
n
[PAT
C
H] Be more lik
e
the 'resolve' strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Define
r
elative
.
git/obj
e
cts/info/al
t
ernates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Detect ls
-
remote
f
ailure properl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vinen
[PATCH] Re
n
am
e
the 'fre
d
r
ik'
m
erge str
a
tegy to 'recursive'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C H
a
mano
Fix off-by
-
o
n
e error in
git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
Propagat
e
error
s
from fetch-p
a
ck
corr
e
ctly to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Fix CDPA
T
H
p
r
oblem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
Document
g
i
t
-
g
rep an
d
link it from th
e
main git
(
7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
[PATC
H
] M
a
ke 'git checkou
t
' a bit more
forgivin
g
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
[P
A
TCH] O
m
it p
a
tches that have
already be
e
n merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Horst v
o
n
Brand
[PATCH] There are several
u
n
documented
d
ep
e
ndencies
commit
|
commitdiff
|
tree
2005-09-13
Linus Torvalds
Improve "git grep" flags
h
an
d
ling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATC
H
]
Ma
k
e the Progr
a
mError c
l
a
ss printable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATC
H
] Make sure w
e
d
ie if we don'
t
get e
n
ough
a
r
g
uments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuiv
i
n
e
n
[P
A
TCH] Int
r
oduc
e
a 'd
i
e
' function
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
K
uivi
n
en
[PATC
H
] Exit
with status
code 2 if we get
a
n exception
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
Kuiv
i
nen
[P
A
TC
H
]
Fix assertion failure when merging common an
c
estors
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Allow finding things that begi
n
with
a
da
s
h in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Linus Torvalds
[PA
T
CH] Add "gi
t
grep" hel
p
er
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Li
n
u
s Torvalds
[P
A
TCH] Add note abou
t
I
ANA confirmation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio
C
Ham
a
no
Use
i
nt instead of socklen_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Herbert
X
u
[PAT
C
H] Apply
N ->
A
status change in diff-helper
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
mart
i
n
@cata
l
yst
.
.
.
[
P
ATCH] archimport - better h
a
nd
l
in
g
o
f
temp dirs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
m
a
r
tin@cataly
s
t
.
.
.
[PATCH] archimport - use GIT_DIR instead of hardc
o
d
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@ca
t
alyst
.
.
.
[PATCH] arc
h
i
mpo
r
t -
upd
a
t
e
in-script d
o
co,
o
p
tion
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PA
T
C
H] archimp
o
r
t docum
e
ntat
i
on tid
y
up
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
m
artin@c
a
t
alyst
.
.
.
[PATCH] archimport
documentatio
n
update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Yasushi SHOJI
[PATCH] Escape ascii
d
o
c's built-in em
-
d
a
sh replacement
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Qin
g
n
i
ng
H
uo
[PATCH]
Fix b
u
ffer o
v
erflo
w
i
n ce_flush()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
Add a ne
w
merge strat
e
gy
b
y Fredrik Kuivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ham
a
no
'git-me
r
ge': Documen
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Us
e
Daniel
'
s read-tree in the merge strate
g
y
'
r
esolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Haman
o
Mu
l
ti-backend merg
e
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
Plug lea
k
in D
a
niel
'
s read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio
C
H
amano
[PATCH] Add deb
u
gging help for case #1
6
to
r
ead-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
n
io C Hamano
[P
A
TCH] Disabl
e
debuggin
g
f
r
o
m
read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[PATCH] Docume
n
t
the trivia
l
merge rules
for 3(
+
mo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel
Bar
k
alo
w
[PA
T
CH
]
Rewrite read-tre
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[PAT
C
H] Add funct
i
o
n
t
o
a
ppend to an ob
j
ect_list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[
PATCH] Add a function for get
t
ing
a
str
u
ct tree for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
an
o
Fix 'git-show-
b
ranch --list
<head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
A
dd 'git bisect replay/log'
documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C H
a
man
o
Keep b
i
sectio
n
l
o
g
so th
a
t
i
t
can be re
p
l
ayed
l
a
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io
C Hama
n
o
Fix copy markin
g
from di
f
fcore
-
r
e
name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
m
a
rtin@catalyst
.
.
.
[PATCH] ar
c
himport
- add
mer
g
e
detection
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio
C
Hamano
Make
sure we
have lea
d
in
g
dir
e
ctor
i
es
un
d
er r
e
fs/{
h
eads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Sve
n
Ver
d
oo
l
a
e
ge
[PATCH] Document
a
ti
o
n
/
r
e
pository-l
a
yout
.
txt
t
ypo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
amano
s
h
ow-branch: --list and --
i
nd
e
pend
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
unio C Ha
m
ano
Re
t
ire support
for old environment variables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C H
a
mano
Adj
u
st
.
gitig
n
ore for big rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Marco
Roe
l
and
[PATCH] remove
duplicate git-
s
end-email-sc
r
ipt
.
perl
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jd
l
@fr
e
esca
l
e
.
com
[
PATCH] fix tutori
a
l typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
j
d
l
@
free
s
c
ale
.
com
[PAT
C
H] Fix t
u
torial r
e
ferenc
e
to git-*-scripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C Hamano
Ign
o
re
d
a
tes
t
a
m
p
-
only changes when insta
l
ling w
e
bdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C Hamano
Sque
l
c
h `remova
l
' message from 'g
i
t
reset
--hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C Ham
a
no
'
b
uild' scri
p
ts before ins
t
alling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
H
ama
n
o
Show all merge-base
c
a
ndidates
f
r
om
s
how-b
r
an
c
h
--merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Documentation
updat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
lars
.
doell
e
@on-line
.
d
e
[PATCH] git-dae
m
o
n --i
n
etd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
Hama
n
o
git --ver
s
i
o
n
tell
s
which versio
n
of git you hav
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Amos Waterland
[
P
ATCH] Do n
o
t create bogus
b
ranch from f
l
a
g to
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Pat
r
ick Mauritz
[
P
ATCH]
Port
a
bility fix for Solar
i
s
10/x86
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Ham
a
no
B
ig tool ren
a
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
GIT 0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
David_
K
ågeda
l
[P
A
TCH] S
i
mplify g
i
t script
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Documentation update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A
Large Angry SCM
[PATCH] Docs f
o
r git-b
u
ild-rev-cach
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SCM
[
P
ATCH
]
Docs for git-s
h
o
w-rev-cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A L
a
rge Ang
r
y SCM
[
P
ATCH] D
o
cs for g
i
t-reset-scrip
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SCM
[PATCH] Docs for git-checkout-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
i
o
C H
a
mano
Documen
t
a
tion updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Jun
i
o
C
H
am
a
n
o
F
latten too
l
s/ directory
t
o ma
k
e
build procedure simpler
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio
C Hamano
mailinfo: barf and exist
u
pon nested m
u
ltipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Merg
e
branch 'mas
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-06
Rene Scharfe
[PATCH] Update
d
ocument
a
tion for
g
i
t-g
e
t-ta
r
-c
o
mmit-i
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
H
.
Peter Anvin
[PATC
H
] g
i
t-cvsimport-scr
i
p
t
: handling of tag
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Fo
r
mat fix for asciid
o
c d
o
cumenta
t
ion titles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Juni
o
C Hamano
Merge branch '
m
aster' of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C
H
ama
n
o
Retire git
-
clone-dumb-http
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[PA
T
CH] Update documentation of --compose to git-send
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[
PATCH] Make git-se
n
d-email-scrip
t
i
gn
o
re some
unnecessary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
uni
o
C Hamano
I
nstall archimp
o
r
t-
s
cript
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Me
r
ge branch 'master' o
f
.
commit
|
commitdiff
|
tree
2005-09-04
Junio C Ha
m
ano
Add co
p
y/r
e
name
check f
o
r git-a
p
ply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
io C Hamano
A
dd a link from update-server-in
f
o documentation to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Make
g
it-ap
p
l
y
under
s
tan
d
i
ncomplete
l
ines
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Ham
a
no
git-ap
p
l
y
mbox: fix '
-
c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
M
ar
t
in
Langhoff
[PA
T
C
H] archim
p
ort: avoid committing o
n
an Arch tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin
L
anghoff
[PATCH] archimport auto
d
ete
c
ts import statu
s
, supports
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Sergey Vlasov
[PATCH] NUL termin
a
te th
e
object da
t
a in patch
_
del
t
a()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Peter Hagervall
[PATC
H
] P
o
ssibl
e
clean
u
ps for local-pul
l
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
P
a
olo 'Blaisorb
l
ade
.
.
.
[P
A
TCH]
D
oc: replace read-cache with git-read-t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Junio C Hama
n
o
Doc
u
ment hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
unio C
H
amano
Merge
b
ranch 'ma
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-02
Junio C Ha
m
ano
M
e
ntion post
-
update when
w
e
f
irst talk about
p
ublishi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
script
s
: eq
u
al
i
ty
test '=
=
' is not portable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
unio C Hamano
git-checkout-script: Remove un
n
e
c
e
ssary varia
b
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next