repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add test case for merge-base.
2005-11-11
Juni
o
C
H
a
m
a
no
A
dd test
ca
s
e f
o
r
m
erge-bas
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Ham
a
no
merge-ba
s
e: avoid unneces
s
ar
y
postproc
e
s
sing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hama
n
o
m
e
rge-base: ful
l
y contaminate t
h
e well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
RPM
:
arch
submod
u
le needs
tla
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C H
a
mano
oc
t
opus: do not d
o
AND'ed merg
e
base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Add
--
p
r
e
tty=fuller
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
D
o not lose a
u
thor name i
n
f
o
rm
a
t
io
n
t
o
l
o
cale gotchas
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C
Haman
o
Document
a
tion: "host:
p
a
th
/
to/repo" is
g
i
t
nati
v
e over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C
H
ama
n
o
Mak
e
git-recursive the def
a
ult
s
trate
g
y for
git-p
u
ll
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io C Haman
o
Use 'merge-base
-
-all' wher
e
applicable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Merge bra
n
ch 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Haman
o
Merge
b
ranch 'hold
/
rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio
C
H
a
mano
git-ap
p
ly: do not fail on
b
inary diff w
h
en not applyin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio
C Hamano
Update INSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
H
ama
n
o
Clean bu
i
ld annoyance
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
H
a
m
ano
Fix a cou
p
le o
f
o
bvious and insig
n
i
f
i
c
ant t
y
po
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
git-am: do not lose alrea
d
y edited final-commit w
h
en
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ham
a
no
Debia
n
: packaging updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Tutorial: do not use 'git resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
H
a
ma
n
o
Documentation: fix depende
n
cy g
e
ner
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Ignore more
g
e
nera
t
ed files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Hamano
Fix docu
m
e
ntation
d
ependen
c
y gen
e
r
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
i
o C Hamano
Documentation: a
s
c
iidoc formatting fix for git-cvsex
p
ort
c
omm
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Do no
t
fail
on hierarchical tagnames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
unio C Hamano
Recove
r
dropped +x bit from git-
p
ull
.
sh by accident
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
unio C Haman
o
Document
a
tion
:
talk about gut
s
of merge in
tutorial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C Hamano
S
e
t up r
e
m
ote
s
/origin to tr
a
c
k
all remote branches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io C Haman
o
git-status: do not mark unmerged paths as committab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o
C Hamano
ls-files: --others
should not say unmer
g
ed paths are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
H
a
m
ano
Doc
u
men
t
ex
p
at dependency when using h
t
tp-p
u
sh
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
mano
Merge in http-pus
h
first
s
tag
e
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
Debian: test
build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
Further De
b
ian s
p
l
it
f
ixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C
Hama
n
o
Install asciidoc s
o
urces as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Hamano
Packa
g
e split:
Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C
Hamano
Si
m
plify CFLAGS/DEFINES
in Make
f
ile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Ham
a
no
gi
t
-fetc
h
:
fai
l
if
s
pecified refspec does not m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
H
a
mano
Doc
u
mentation
:
pull
/
clone ref ma
p
ping c
l
arif
i
catio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Haman
o
git-format-patch:
si
l
l
y typo fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
t
e
st: t4102-apply-rename fail
s
with
s
trict umas
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Ham
a
no
git-clone: fix local cl
o
ne
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
i
nit-db::copy_
f
i
l
e() - use
c
o
p
y_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
Hamano
copy
.
c::copy_fd() - do not l
e
ak file
descriptor on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Do
c
umen
t
ati
o
n
:
format-patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C H
a
mano
format-patc
h
: "rev
1
.
.
"
should mean "rev1
.
.
HEAD
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C
Hamano
Documentation: git
-
fetch
/
pull updat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C Hamano
Docu
m
en
t
t
he
-
-
no-
c
ommit flag better
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
Docu
m
entation: -
m
er
g
e and
-
pull: de
s
c
r
i
be merge strategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
Doc
u
men
t
ation:
g
it-
a
dd -- do no
t
say "
c
ache", add exa
m
ples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C
Hamano
g
it-tag: Do
n
o
t
assume the working tree
root is writable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C
Ha
m
ano
I
llu
s
trat
i
o
n
: "Commit DAG R
e
visi
o
n N
a
ming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
i
o C
H
amano
Illu
s
tration: "Git
Diff Typ
e
s"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C
H
amano
Illustration: "F
u
n
damental Git Index Ope
r
ations"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
git-merge-ours: make sure our i
n
dex matches HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
io C Ham
a
no
Add
'
o
u
r
s
'
merge st
r
at
e
g
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Ad
d
--no-commit
to git-
m
er
g
e/git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
D
ocu
m
ent --si
n
ce
and --until options to rev-
p
arse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
Be careful when dereferencing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
Ignore '\r' at t
h
e e
n
d of line in $GIT_DIR
/
config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do
n
ot
fail on hierarchi
c
al branch names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Make test-date build
a
b
le again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
gi
t
-clo
n
e: do not forge
t
t
o create origin br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Juni
o
C Hamano
Do not
put au
t
omati
c
merge mes
s
age
a
fter sign
e
d-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C Hamano
Add -
P
to the
d
ocu
m
enta
t
ion head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Juni
o
C Hamano
Do not install backw
a
rd compatibility l
i
nks anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio
C Hamano
Fix constne
s
s of input in mozilla-sha1/sha1
.
c::S
H
A1_Update()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C H
a
mano
Documen
t
the
use of "current d
i
recto
r
y" as pul
l
source
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io C Hamano
Work around an RPM
b
uil
d
pr
o
blem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
J
u
n
io C
H
amano
Fix rev-list documentation again
(
--s
p
a
rse and pat
h
spec)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
J
u
nio
C
H
a
mano
U
p
date gi
t
-
p
ack-obj
e
c
t
s
doc
u
mentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io C
H
amano
Update
g
it-re
v
-list options l
i
st i
n
rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
Ha
m
ano
Update usage s
t
ring a
n
d
documentation for git-re
v
-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ha
m
ano
GI
T
0
.
99
.
9 master branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
H
a
mano
GIT 0
.
9
9
.
9
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
Hamano
Documentat
i
on updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C
Hamano
D
o
n
o
t mmap-c
o
py the w
h
ole thing; just u
s
e
copy_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
Hamano
Teach local-fetch about lazy object di
r
ector
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
u
nio C
H
a
m
ano
Fix recent documentation fo
r
mat breakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
git-apply --numst
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Haman
o
Document
git-patch-id a bit be
t
ter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-27
J
u
nio C Hamano
Merge
branch 'js-f
a
t'
commit
|
commitdiff
|
tree
2005-10-27
Jun
i
o C Ha
m
ano
Mer
g
e br
a
nch 'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
Juni
o
C Ham
a
no
Merg
e
h
t
tp://www
.
kernel
.
or
g
/pub/scm/gi
t
k/gi
t
k
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
pack-objects: Al
l
ow use of pre-
g
enerat
e
d pack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C
H
amano
upload-pack: tighten request
valida
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
J
u
nio C Hamano
Add
[
v
]ie
w
patch i
n
git-am inte
r
active
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
git-am: make it
e
asier after
fixin
g
up a
n
unapplica
b
le
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-25
Ju
n
io C Hama
n
o
R
e
vert re
c
ent fetch-pack/upload-pack
updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Hamano
u
pload-pack
:
fix thinko in common-com
m
i
t
f
inder
c
ode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Haman
o
Clarify git status output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-23
Junio C
Hama
n
o
M
erge bran
c
h
'fi
x
es'
commit
|
commitdiff
|
tree
2005-10-23
Junio C
Hamano
gi
t
-show-branch: F
i
x off-by-o
n
e error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
Allow git-merge
not to commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
J
u
nio C H
a
mano
up
l
oad-pack: Incre
a
se MAX_HAS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
Fix ma
l
format
t
ed git-am
d
ocu
m
e
n
tati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hama
n
o
M
e
rge branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-21
Ju
n
io
C Ham
a
n
o
daemon
.
c
:
remo
v
e trai
l
ing whitespace
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
Fi
n
ish gi
t
-am
d
ocumentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
Fix miss
i
ng e
x
ports in git-
a
m
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio C Hamano
Make sure we b
a
rf o
n
ref^{
t
ype} fa
i
lure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next