repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: match the unmerged index entry behaviour with merge-resolve
2005-11-11
Ju
n
io C
H
amano
mer
g
e-base: avoid unnecessary
postpro
c
e
ssing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
uni
o
C Hamano
merge-base:
f
ully contam
i
nate
the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
R
P
M: arch su
b
module needs tl
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
octopus: do not do AND'
e
d
m
erg
e
b
a
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
a
ma
n
o
Add
-
-pretty=fulle
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
Do not lose autho
r
name inform
a
tio
n
to loc
a
le gotchas
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
D
ocumentati
o
n:
"
host:pa
t
h/to/re
p
o" is git native
over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
J
uni
o
C Hamano
M
a
k
e git-recursive the default st
r
ategy for git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hama
n
o
Use
'merge-base
-
-all'
w
her
e
applicable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
J
uni
o
C
H
amano
Merge
b
ranch 'hold/svn
'
commit
|
commitdiff
|
tree
2005-11-10
Junio C
H
amano
M
erge br
a
nch 'hold/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio
C
Hamano
g
i
t-appl
y
: do not f
a
i
l
on
b
inary diff
when
n
ot applying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
J
u
ni
o
C
Hamano
Upd
a
te
I
N
STALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
ni
o
C
H
amano
Clean
bu
i
ld annoyance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix a couple of
o
bvious and
i
nsi
g
n
ificant typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Hama
n
o
g
i
t
-am: d
o
not lose alr
e
a
d
y edited final-co
m
mit when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Deb
i
an: packa
g
ing update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Tutorial
:
do not us
e
'git resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
Hama
n
o
Documentati
o
n: fix depen
d
ency generatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Ignor
e
m
o
re
generat
e
d files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hama
n
o
Fix documentation depend
e
ncy generati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Ha
m
a
no
Documentation: asciidoc fo
r
matting f
i
x fo
r
gi
t
-cvsexpor
t
comm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Hamano
Do not
f
a
il o
n
hierarchical tagnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Recover dropped +
x
bit fro
m
git-pull
.
sh
b
y ac
c
ident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Hamano
D
o
cumentat
i
on: talk
a
b
o
ut guts of m
e
rge i
n
tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
un
i
o C Hamano
Set up
r
e
m
o
t
es/origin to track all re
m
ote br
a
nches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
un
i
o C Hamano
git-sta
t
us: do n
o
t mark unmerg
e
d paths as c
o
mmittable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
ls-files: --others sho
u
ld not s
a
y unme
r
ged paths
are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Haman
o
Document expat d
e
pendency wh
e
n using htt
p
-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
Merge in http-push
f
irs
t
stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
n
o
Debi
a
n: test build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
Fu
r
th
e
r Debian split f
i
xes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
H
a
ma
n
o
Insta
l
l
a
s
c
iidoc s
o
urc
e
s as wel
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Pac
k
age spli
t
:
Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
S
im
p
li
f
y CFLAGS/DEFINES in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Ha
m
ano
g
i
t
-
f
e
tch: fail if specified refspec
d
oes not match
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
Docu
m
enta
t
ion: pull/clone ref map
p
ing clarification
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C H
a
m
a
no
git-format-patc
h
: silly typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Haman
o
t
est: t4102-appl
y
-rename fails with strict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
git-
c
l
one: fix lo
c
a
l
clone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
i
n
i
t
-db::copy_file() - use c
o
py_
f
d()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Haman
o
copy
.
c::copy_
f
d() - do not leak file
d
escriptor
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
Documentat
i
on: f
o
rm
a
t-pa
t
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
fo
r
m
at-p
a
tch: "r
e
v1
.
.
" sh
o
uld mean
"
r
e
v1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ham
a
no
Documentati
o
n: gi
t
-fe
t
ch/p
u
ll upd
a
te
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
Ha
m
ano
Documen
t
the --no-commit fla
g
bett
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C
Haman
o
Documentation: -
m
erge
and -
p
ull: describe
mer
g
e st
r
ategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C
H
a
mano
D
o
cument
a
tion: git-add -- do no
t
say "cache", ad
d
examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C
H
amano
git-tag: Do not assume the working tree root
i
s
writa
b
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio
C Hamano
I
l
lustra
t
ion: "Commit DAG Revis
i
on Nam
i
ng"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Illustr
a
tion: "Git Diff
Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Illustratio
n
:
"
F
undam
e
ntal Git
I
ndex
Ope
r
a
t
i
o
n
s
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C
Hama
n
o
g
i
t-merge-
o
ur
s
: make sure o
u
r index matches HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
A
d
d 'ours' merge strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
aman
o
A
d
d
--no-c
o
mmit t
o
git-me
r
ge
/
gi
t
-
p
ull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Docum
e
nt --since and
-
-until opt
i
o
n
s to r
e
v-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Be careful when der
e
ferenci
n
g tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Ignore '\
r
'
at the
e
nd of line in $
G
I
T
_DIR/
c
onf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not fai
l
on hierarchical branch names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
Make test-d
a
te bui
l
dable again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
n
i
o
C Hamano
git-clone: do not
f
or
g
et to
c
reate origin branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
H
a
mano
Do not put automatic merge
message a
f
ter signed-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
unio C Hamano
A
d
d -P to t
h
e docum
e
n
tation head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o C
H
a
mano
Do no
t
install backward comp
a
tibi
l
ity links anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Hamano
Fix constness of in
p
ut
i
n
mozilla-sha1/sha1
.
c::SHA1_Update()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Hamano
Document
t
h
e
use
of
"
cu
r
rent direc
t
o
ry" as pull sourc
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C
H
a
m
a
no
Work around an RPM build problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
u
nio C Hamano
Fix rev-l
i
st documenta
t
i
o
n again
(
--spa
r
se a
n
d
p
athspec)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Updat
e
git-pack-obje
c
ts docum
e
ntation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io
C
Hama
n
o
U
pdate git-rev-list optio
n
s list in rev-pars
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Haman
o
Upd
a
te
u
sag
e
string and doc
u
mentation for git-rev-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
GIT 0
.
99
.
9
m
aster branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
H
amano
G
I
T 0
.
9
9
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Haman
o
Docum
e
ntation upd
a
t
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
amano
Do not m
m
a
p
-
copy the whol
e
thing;
j
u
s
t use cop
y
_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
amano
Teac
h
local-fetch about
lazy objec
t
direct
o
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
u
nio C Hamano
Fix recent docum
e
ntation form
a
t breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C H
a
mano
git-apply --numstat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Hama
n
o
D
o
cument git-patch-id a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-27
Junio C Hamano
Merge branch
'
js-fat'
commit
|
commitdiff
|
tree
2005-10-27
J
u
nio C Hamano
Merge br
a
n
ch '
l
t-dense'
commit
|
commitdiff
|
tree
2005-10-27
J
u
nio C
H
a
m
a
no
Merge http://www
.
kernel
.
org/pub
/
scm/gitk/git
k
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
pac
k
-object
s
: Allow
u
se of
p
re
-
ge
n
era
t
ed p
a
ck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C
H
ama
n
o
upload-pack: tighten request validation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio
C
H
amano
Add [v]iew patch in gi
t
-am int
e
ractive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Ha
m
a
no
g
i
t
-a
m
: make it easi
e
r
af
t
er fixing up an un
a
pplicable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-25
Junio
C Hamano
Revert recent fet
c
h-pack/uploa
d
-pack
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Hamano
up
l
oad-pack: fix
t
hinko in common
-
commit finder code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Juni
o
C Hamano
Clarify git status outpu
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-23
Juni
o
C Hamano
Merge bra
n
ch 'fixes'
commit
|
commitdiff
|
tree
2005-10-23
Junio C
Haman
o
git-show
-
br
a
nch:
Fix off-by-one
e
rror
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
Allow git-merge not to comm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio C
H
a
m
ano
upload-pack: Increase MAX_
H
A
S
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio C
H
amano
Fix malfo
r
m
a
tted
g
it-am docu
m
en
t
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hama
n
o
Merge
b
ranch 'fixes'
commit
|
commitdiff
|
tree
2005-10-21
Jun
i
o C Hamano
daemon
.
c: remo
v
e
t
railing whitesp
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C
Hamano
Fini
s
h git
-
am documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Ha
m
ano
Fix missing expo
r
ts in git-am
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C H
a
mano
Merge /pub/scm/git
/
git
t
o recover lost side branch
Signed-off-by:
Junio C Hamano
<junio@hera.kernel.org>
commit
|
commitdiff
|
tree
2005-10-20
Junio
C
Hama
n
o
Make sure
we
barf o
n
ref^
{
t
ype}
f
ailure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next