repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-one-file: use common as base, instead of emptiness.
2005-11-12
Junio C Ha
m
ano
merge-one-file: use
c
o
mmon as base
,
instead of emp
t
iness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge with /dev/null
a
s bas
e
, instead of pu
n
ti
n
g
O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
INSTAL
L
: duplicate p
y
thon requirem
e
nts from Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
i
o
C
H
am
a
no
Merg
e
branches 'jc/sb' a
n
d 'jc/
m
b'
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
t1200: use --topo-order to keep the show
-
bran
c
h out
p
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Hamano
Fully
detect
u
n
interesti
n
g commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
mano
git-show-b
r
a
n
ch: tight
e
n merge-bas
e
compu
t
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Ham
a
no
Add t
e
st case
for merge-
b
ase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ham
a
n
o
merge-ba
s
e
: a
v
oid
u
n
neces
s
ary po
s
tprocessi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
merge-base: f
u
ll
y
conta
m
i
n
a
t
e the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C
Hamano
RPM:
a
r
c
h subm
o
d
u
l
e ne
e
ds tla
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Hamano
o
ctopus: do not do A
N
D'ed merge b
a
se
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
uni
o
C Hamano
Add
--pretty=ful
l
er
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Do not lose aut
h
or n
a
me
information to locale
g
otchas
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
ma
n
o
Docu
m
entati
o
n: "
h
os
t
:path/to/r
e
po"
is
git native over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io C Hamano
Make
g
it-recursive the d
e
fau
l
t
s
trategy f
o
r git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
J
unio C
H
am
a
no
Use 'merge-base --all' where applicable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C H
a
m
a
no
Mer
g
e branc
h
'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Haman
o
Merge b
r
anch 'hold/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio C H
a
mano
gi
t
-apply: do not fail on
b
ina
r
y diff when not applying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Junio
C Ham
a
no
Upda
t
e IN
S
TA
L
L
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Hamano
Clean
build ann
o
yance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix a co
u
p
l
e of obvious and i
n
significant typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C Hamano
git-am: do not l
o
se a
l
ready edit
e
d final
-
commit when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C Hamano
Debian: packaging
u
pdat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C H
a
mano
Tutorial: do no
t
use 'git resol
v
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
ocumenta
t
ion:
fix dependency ge
n
erat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Ignore more
g
ene
r
ate
d
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C Hamano
Fix
d
o
cumentation dependency generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Haman
o
Docu
m
ent
a
tion: asc
i
idoc
formatti
n
g fix
fo
r
git-cvsexportcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Haman
o
D
o
n
ot fail on hierarc
h
i
c
al tagn
a
mes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C
H
amano
Reco
v
e
r dropped +x
bit
f
rom git-pull
.
sh by accident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Hamano
D
o
cume
n
tation: talk ab
o
ut
g
uts of
merge in
t
utorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io
C Hamano
Set up remot
e
s/origin to trac
k
all remote bra
n
ches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io
C Hamano
git-status: do n
o
t mark unmerged paths as c
o
mmittable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C
H
a
m
ano
l
s
-files: --others sh
o
uld
not say unmerged paths are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C
H
a
mano
D
ocu
m
ent exp
a
t
d
e
p
endency
w
hen using http-p
u
sh
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
i
o
C Hamano
Merg
e
in http-
p
u
sh fi
r
st
stage
.
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io
C
Hama
n
o
Debian:
test build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Further Debia
n
spli
t
fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Install asciidoc sources
as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C
H
amano
Package s
p
lit: Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
Simplify CFLAGS/D
E
FINES in Make
f
il
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
H
amano
g
i
t-fetch: fai
l
if speci
f
i
ed
re
f
spec does
n
ot match
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio
C Ham
a
no
Docume
n
ta
t
ion:
p
ull/clone
r
ef m
a
ppi
n
g clarificat
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
no
git-fo
r
mat-pat
c
h: s
i
lly typo
fi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C Hamano
t
e
st: t
4
1
02-apply-rename fails with strict uma
s
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
Hamano
g
it-clone: fix local
c
lo
n
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
ni
o
C
Hama
n
o
i
n
i
t-db::
c
opy_file() -
u
se copy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Hamano
copy
.
c::copy_fd(
)
-
do n
o
t
l
e
ak
f
i
le descriptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
ni
o
C Ham
a
no
Doc
u
mentat
i
on: format-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C Hamano
for
m
at-
p
atch: "rev1
.
.
"
should mean
"
rev1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ha
m
a
no
Doc
u
mentation: git-fetch/
p
ull update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o
C
Ha
m
ano
Document the --n
o
-c
o
mmit flag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io C Hama
n
o
Documentation
:
-merge an
d
-pull: de
s
cribe merge strategi
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C Hamano
Docume
n
t
a
t
i
on: git-add -- d
o
not say "cac
h
e
", add examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
git-tag: Do not assume the working tree root is writ
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Illustra
t
ion: "Commit DAG Revision
Naming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustrat
i
o
n
: "Git Dif
f
Type
s
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustra
t
ion: "Fundamental
G
it Index
Operati
o
ns"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
git
-
m
erge-ours: mak
e
sure
o
u
r
inde
x
matches
H
EA
D
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C
Hamano
Add 'ours'
m
erge
s
t
rateg
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C
H
ama
n
o
A
d
d --no-commi
t
to
git-merge/g
i
t-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Documen
t
-
-
s
ince and --until options to rev
-
parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
mano
Be
carefu
l
when dereferenci
n
g tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Ignore
'\
r
' at
t
he en
d
o
f line in $GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
ama
n
o
Do n
o
t fail on hierarc
h
ical branch names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C H
a
mano
Make test-date bu
i
ldable again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o C Ham
a
no
git-clone:
d
o not forget to
c
r
eate origin
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
D
o not put automatic mer
g
e mess
a
g
e
after signed-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Ham
a
no
Add
-
P t
o
the documenta
t
ion head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
H
amano
Do not install backw
a
rd compatibilit
y
links anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C H
a
ma
n
o
F
i
x constness of input in mo
z
illa-s
h
a1/sha1
.
c
::SHA1_
U
pdate()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C
Hama
n
o
Document
t
he use of "
c
urrent directo
r
y" a
s
p
ull source
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
H
amano
Work around an RPM
build p
r
oble
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
F
ix rev-list
doc
u
mentat
i
on again (--sparse and pa
t
hspec)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C Hamano
Update git-pack-objects document
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update
git-rev-list
options
l
ist in rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update usage string and documenta
t
ion
f
o
r git-rev-
l
ist
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
GIT 0
.
99
.
9 master branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io
C
Ham
a
no
GIT 0
.
99
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
amano
D
ocumenta
t
ion updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io C Hamano
Do
n
o
t
mmap-copy
t
he wh
o
le thing; just use cop
y
_
f
d()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C Hamano
Tea
c
h
local-fetch about lazy ob
j
ect director
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
am
a
no
Fix re
c
ent documentation f
o
rma
t
b
r
e
a
kage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o
C H
a
mano
git-apply --numst
a
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Junio
C
Hamano
Docume
n
t git-patch-
i
d 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
Junio
C
Hamano
Merge
bran
c
h 'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
Junio
C
Hamano
Merge
h
ttp
:
/
/ww
w
.
kernel
.
or
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
p
a
ck-o
b
jects: A
l
low u
s
e of pr
e
-generated pack
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Juni
o
C Hamano
upl
o
ad-pa
c
k: tighten request
valid
a
t
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hama
n
o
Add
[
v]iew
p
atch in git-am
interactive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Ha
m
ano
git-am
:
make it easier after fixing
up
a
n u
n
applicable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-25
Junio
C H
a
mano
Reve
r
t
rece
n
t
fetch
-
pa
c
k/upload-pac
k
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
J
unio C Hamano
uploa
d
-pack
:
f
i
x thinko
in
c
ommon
-
commit finder code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
J
u
n
io C Hamano
Clarif
y
g
it status ou
t
put
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hamano
Merge
b
r
anc
h
'fixes'
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hamano
git-show-branc
h
: Fix
o
ff-by-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
Allow git-m
e
rge not to
c
o
m
mit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next