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
merge-one-file: use empty- or common-base condintionally in two-stage merge.
2005-11-12
Junio C Hamano
merge-one-f
i
le:
u
se empty
-
or common-base condintiona
l
ly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C Hamano
Docum
e
ntation: g
i
t-app
l
y
--n
o
-add
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge-
o
ne-file: use common as base,
i
n
stead of emptiness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ha
m
ano
merge wit
h
/
d
ev/null as base, instead of puntin
g
O
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
INSTALL: dupl
i
cat
e
python requirements from Make
f
ile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Hamano
M
erge
b
ranches 'jc/sb' and 'jc/
m
b
'
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ham
a
no
t12
0
0:
use --topo-order to keep the sh
o
w
-branch output
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
io
C Hamano
Fu
l
ly de
t
ect
u
ninter
e
sting
comm
i
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
git-show-branc
h
: tig
h
ten
m
erg
e
-
b
a
s
e computation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Haman
o
A
d
d test
c
ase f
o
r merge-b
a
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Ham
a
no
m
e
r
ge-base: avoid
u
nnecessary postp
r
o
c
ess
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
m
erge-
b
ase: fu
l
ly
con
t
a
minate the we
l
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Hamano
RPM: arch sub
m
odule
n
eeds tla
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Hamano
octop
u
s: do not d
o
AND
'
ed mer
g
e bas
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
Add -
-
pretty
=
fuller
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
Do
not lose
author name in
f
o
rma
t
ion to locale
g
otcha
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Hamano
Do
c
ument
a
tion: "host
:
path/to/repo" is
gi
t
n
ati
v
e
ove
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Jun
i
o C Ha
m
an
o
Make git-recursive the default s
t
rategy for git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Haman
o
Us
e
'merge-bas
e
--all' where ap
p
lic
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
J
u
nio
C Hamano
Merge branch 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
J
un
i
o C
Hamano
M
e
r
g
e
branch
'hold
/
rpm
'
commit
|
commitdiff
|
tree
2005-11-09
Jun
i
o
C
Hamano
git-
a
pply: do
n
ot fail on binary di
f
f when not apply
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio C
H
amano
Update
I
NSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C Hamano
Clean build an
n
oyanc
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
amano
Fi
x
a couple of obvious and i
n
significant typo
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
g
it-am: do not lose alread
y
edited
final-commit wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hamano
Debian:
pa
c
kaging
updat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Ham
a
no
Tutorial: do not use 'git resol
v
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
o
c
u
men
t
a
t
i
on: fix
dependency ge
n
eration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Ignore more generate
d
f
iles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Fix docume
n
tation dependency gener
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
amano
D
ocumen
t
ation: asciidoc f
o
rmatting fix
f
o
r gi
t
-c
v
se
x
portc
o
mm
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
ma
n
o
Do
n
ot
fail on h
i
er
a
rchical tagnames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io C Hamano
Recov
e
r dropped
+x bit from git-pull
.
s
h by accide
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Documentation: talk a
b
o
ut guts of
me
r
ge
in tuto
r
ial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o C Hamano
Set up remotes/o
r
igin to track a
l
l remote bra
n
ches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hama
n
o
git-status: do
not mark
u
n
m
erged paths as
c
om
m
ittab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
u
n
i
o C Hamano
l
s
-files: --oth
e
rs should
not say
unmerged path
s
a
r
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Haman
o
Document
expa
t
dependency when using ht
t
p-p
u
sh
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C H
a
m
ano
Merge
in
h
t
tp-push first sta
g
e
.
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Ha
m
ano
Debia
n
: test
bui
l
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Ha
m
ano
Further Debi
a
n
s
p
lit fi
x
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
Ins
t
all asciidoc sour
c
e
s
as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
Pac
k
age split:
D
ebian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
u
n
io C Hama
n
o
Simplify
CFLAGS/DEFINES
in Ma
k
e
f
i
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
git-fetch: fail if specif
i
ed refspec do
e
s not match
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
H
am
a
no
D
o
cumentation: pull/clo
n
e
r
e
f mapping
c
larification
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Ha
m
ano
git-format-pat
c
h:
s
il
l
y typo fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
test: t4102-ap
p
l
y-r
e
name fa
i
ls with strict umask
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
g
i
t
-clone:
f
ix
l
oca
l
cl
o
ne
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
Hama
n
o
init-db::copy
_
f
ile() - use co
p
y_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ham
a
no
copy
.
c::copy
_
fd() - do n
o
t
l
e
a
k file descr
i
ptor on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Docu
m
entation: format-patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C H
a
m
a
no
format-patch: "rev1
.
.
" sh
o
uld
m
ean
"rev1
.
.
HEAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
m
a
no
Documentation: git-fetch/p
u
ll updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
Hamano
Document the --no-commit flag better
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
Docu
m
ent
a
t
io
n
: -me
r
ge
and -
p
ull: describe merge str
a
tegies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C Hamano
Doc
u
menta
t
ion: git-
a
d
d -- do not say "c
a
che"
,
add examples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Jun
i
o C
Hamano
git-tag: Do not
ass
u
me the
w
orking t
r
ee roo
t
is writable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hamano
I
llustration:
"
Commit DAG Revisio
n
Naming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hama
n
o
Illustration: "Git Diff Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C
H
amano
Il
l
ust
r
atio
n
: "
F
unda
m
ental Git Ind
e
x Operat
i
ons"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
git-merge-ours: make
s
u
re our index match
e
s HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add 'ou
r
s' m
e
rge strat
e
gy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C
H
amano
Add -
-
no
-
commit to git
-
merge
/
g
i
t-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hamano
Docume
n
t --
s
ince an
d
--until opt
i
ons to r
e
v-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hama
n
o
Be c
a
r
e
f
ul when dereferen
c
ing t
a
gs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C
H
ama
n
o
I
g
n
ore '\r' at the
e
nd
o
f
l
i
ne
in $GIT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Do not fai
l
on hierarchica
l
bra
n
ch n
a
mes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io
C Ha
m
ano
M
ake test-d
a
te buildab
l
e
again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
u
ni
o
C Ha
m
ano
git-
c
l
o
ne: do not forget to c
r
eat
e
o
r
igin
b
ranch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do not p
u
t
a
ut
o
mat
i
c merge message
a
fter sig
n
ed-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Juni
o
C
Hama
n
o
Add
-
P
to
t
he documen
t
ation h
e
ad
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio
C Hamano
Do
n
ot install backward compatib
i
l
ity links anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio
C Ham
a
no
Fix constness of input in
m
ozil
l
a-sha
1
/sha1
.
c::
S
H
A1_Upda
t
e()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Hamano
Docu
m
ent t
h
e use of "curr
e
nt direc
t
ory" as pull sourc
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io C Hamano
W
ork around an RPM buil
d
pro
b
l
e
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
i
o C Hamano
Fix re
v
-list documen
t
ation ag
a
i
n
(-
-
sparse an
d
p
athspec)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update git-p
a
ck-objects documentati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
Ha
m
ano
Up
d
ate git-rev-list
options lis
t
i
n rev-p
a
r
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C
Hamano
Update usage string and docume
n
tation for git-rev-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Jun
i
o
C Haman
o
GIT 0
.
9
9
.
9 master branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io C Ha
m
a
n
o
G
I
T 0
.
9
9
.
9
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
unio C
H
am
a
no
Documentation upd
a
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C H
a
mano
D
o
not mmap-copy t
h
e
w
hole thing; just use copy
_
fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
uni
o
C
H
amano
T
e
a
ch
l
o
cal-fet
c
h about lazy o
b
ject direc
t
ories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
Hamano
Fix
r
e
cent d
o
cumentation format breakag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
git-
a
pply -
-
n
umstat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Hamano
Document
g
i
t-
p
atch-
i
d a
b
it better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-27
Junio C Ham
a
no
Me
r
ge branc
h
'
js-fat'
commit
|
commitdiff
|
tree
2005-10-27
Junio C H
a
mano
Merge branc
h
'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Hamano
Merge htt
p
:
//www
.
kern
e
l
.
o
rg/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-10-26
Junio C
H
amano
p
ac
k
-objects
:
Allow use of
p
r
e-gener
a
ted pack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Ham
a
no
upload-
p
ack:
t
ight
e
n
requ
e
st validation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C
Hamano
A
d
d [v]iew pa
t
ch in
git-am interactive
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
J
unio C H
a
man
o
git-am: make it
e
a
s
ier
after fixing up an unappli
c
a
b
le
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-25
Jun
i
o C Hamano
R
e
v
ert r
e
cent
f
etch-pack/up
l
oad-pack updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
J
unio C
H
ama
n
o
upload-pack
:
fix thinko in common-commit fi
n
d
er code
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Hamano
Clarify git status ou
t
put
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-23
Juni
o
C Hamano
Merge bran
c
h 'fi
x
e
s
'
commit
|
commitdiff
|
tree
next