repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'
2005-11-12
Junio C Haman
o
merge-on
e
-file: use e
m
pty- or
co
m
mon-base condint
i
onally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
Documentation: g
i
t-apply --no
-
add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o
C Haman
o
merge-on
e
-file: use c
o
mmon as base, instead of emptiness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
me
r
ge
w
ith /dev/null as base,
i
nstead of
p
untin
g
O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
I
NSTALL: duplicate python requirements from Ma
k
ef
i
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Merge br
a
nches 'jc/sb' and 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
i
o C
H
ama
n
o
t1200:
u
se -
-
topo-order
t
o
keep
t
he show-bran
c
h output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Haman
o
Fully dete
c
t uninterestin
g
comm
i
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Hamano
git
-
show-bran
c
h: tighten merge-base
computation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Hamano
Add test case for
m
erge-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
io C Haman
o
merge-base: avoid unnecessary pos
t
pr
o
ces
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
io C Hamano
merge-base:
fu
l
l
y con
t
am
i
nate the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Hamano
RPM: arch submodule needs tla
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ham
a
n
o
octopus: do not do AND'ed
m
erg
e
b
ase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Hamano
Add --pretty=fuller
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Do not lose author na
m
e in
f
or
m
ati
o
n to locale gotc
h
as
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Haman
o
Docu
m
entatio
n
:
"
host:p
a
th
/
t
o
/re
p
o"
i
s
git native over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Make git-
r
ecursive the default strategy for git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C H
a
mano
Use
'
merg
e
-base --all
'
wher
e
applicable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
J
unio C H
a
mano
M
erge branc
h
'hol
d
/svn'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Ha
m
ano
Merge
b
ra
n
ch 'hold/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio
C
H
amano
git-appl
y
: do not f
a
il
on binary di
f
f when not app
l
ying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Junio
C H
a
mano
Update 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
b
uild annoyance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C Hamano
Fix a
c
o
u
p
le of obvious
a
nd
i
nsigni
f
icant typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
Hamano
git-am: do not l
o
se
already ed
i
t
ed final-com
m
i
t when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Ham
a
n
o
Debian:
p
acka
g
ing update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Tutorial:
do not use 'git resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Document
a
t
i
on:
fix dependency gen
e
ration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C H
a
mano
I
g
nore more ge
n
erat
e
d files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix docum
e
ntation de
p
endency g
e
nera
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
un
i
o C Hama
n
o
Documentation: asci
i
do
c
formatting fix fo
r
git-cvsexportcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Do not fai
l
o
n
hierarchical tagnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hama
n
o
Recov
e
r dr
o
p
ped +x bit from
g
it-pull
.
sh by accident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Documentati
o
n: talk about guts of
m
e
rge
in tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o
C
Hamano
Set u
p
rem
o
tes/origin to tra
c
k al
l
remo
t
e branches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
Hamano
git-status: do n
o
t mark un
m
erged paths as c
o
mmit
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
nio C Hamano
ls-files:
-
-others should not say unmerged paths are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Documen
t
e
x
pat dependency
when
u
s
i
ng http-pus
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Me
r
ge in http
-
push first stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
Debian: tes
t
build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio
C Haman
o
Furt
h
er Debian split
f
ix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
a
m
a
no
Install
a
s
c
iidoc sources as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Pa
c
k
age split: Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Hamano
Sim
p
lify CFLAG
S
/DEFINES
in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Ha
m
ano
git-fe
t
ch: fai
l
if s
p
ecified refspec does not matc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ha
m
ano
Docu
m
e
n
tation: pull/clone ref ma
p
ping clarif
i
cation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
i
o
C Hamano
git
-
format-patch: silly typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
Hamano
test: t4102-app
l
y-r
e
n
a
m
e fails
w
ith strict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
git-clo
n
e: f
i
x
l
ocal clo
n
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o
C Hamano
init-db::co
p
y_file() - us
e
copy_fd
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C Hamano
copy
.
c::copy_fd()
- do not leak
f
i
le descript
o
r
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Ham
a
no
Documentation:
f
ormat-pat
c
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
form
a
t-patch: "rev
1
.
.
"
should mean "rev1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Docum
e
ntation: git-fe
t
ch/pull upda
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Document the --no-com
m
i
t flag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io C Hamano
Document
a
tion: -merge
and -
p
ul
l
: describe merge strategie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C
Hamano
Documentation: git-add -- do n
o
t say "cache"
,
add exampl
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
git-t
a
g:
D
o not ass
u
me the
w
orking
tree root is writ
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustration: "Comm
i
t DA
G
Revision
N
aming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Il
l
ustra
t
ion: "Git Diff Type
s
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
i
o
C Hamano
Illustr
a
tion:
"
Fundamental Git Index O
p
erations"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
git-merg
e
-ours: make su
r
e
o
ur index mat
c
hes HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
mano
Add 'ours' merge strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add --no-commit to git-me
r
g
e/gi
t
-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
a
ma
n
o
Do
c
ument --since and
-
-until optio
n
s
t
o rev-p
a
rse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Be careful when dere
f
erencing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
gno
r
e
'\r' at th
e
end of l
i
ne in $GIT_DIR/co
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do n
o
t fail on hierarchical
branc
h
nam
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
Mak
e
test-d
a
te bui
l
dabl
e
a
g
ain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C Hamano
git-clone:
d
o not forg
e
t to create origin branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
H
amano
Do n
o
t
put automatic m
e
rg
e
m
e
ssage
a
f
ter s
i
g
n
ed-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o C
H
amano
Add -P to
t
he
d
ocumentatio
n
head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
io C Hamano
Do not install
backward compatibility links any
m
ore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Ju
n
io C Hama
n
o
Fix constness of input
i
n m
o
zilla-sh
a
1/sha1
.
c
:
:
S
HA1_Update()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio
C
Ham
a
n
o
Documen
t
the use
of "cu
r
r
e
n
t
directory
"
as pull sourc
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Work around an RPM b
u
ild pr
o
blem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Jun
i
o C
H
ama
n
o
Fix
r
ev
-
list docum
e
ntation aga
i
n
(--sparse and
pathspe
c
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update git-pa
c
k
-objects documenta
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
unio
C
H
amano
Update git-rev-list
op
t
ions
list in rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
U
p
date usage strin
g
and docu
m
entation
f
or git-re
v
-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Juni
o
C Hamano
G
I
T 0
.
9
9
.
9 master b
r
a
nch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
u
nio C
Hamano
GIT 0
.
9
9
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Documentation
upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
amano
Do
not mmap
-
co
p
y the whole thing
;
ju
s
t us
e
copy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Juni
o
C Haman
o
Teach local-fetch about
lazy object dire
c
tories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C H
a
mano
Fix recent doc
u
mentation
fo
r
mat breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
unio
C
Ha
m
ano
git
-
app
l
y --numstat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Ju
n
i
o
C H
a
mano
D
o
cum
e
nt git-patch-id a
bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-27
Junio C H
a
mano
Merge b
r
anch 'js-
f
at'
commit
|
commitdiff
|
tree
2005-10-27
J
u
n
io
C
H
amano
Merge branch 'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Ha
m
an
o
Merge http://
w
ww
.
kernel
.
o
r
g
/
pub/sc
m
/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Juni
o
C Haman
o
p
ack-
o
bjects: Allow use
o
f pre-gene
r
ated
p
ack
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Ju
n
io C Hamano
upload-pack: tighten
r
equest validation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Jun
i
o C Hamano
Add
[
v]iew patch in git-am
i
nteractive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Jun
i
o
C
Hamano
git-am:
make it easier after fixing up an unapplicable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-25
Junio C Hama
n
o
R
e
v
er
t
r
ec
e
nt
f
etc
h
-pac
k
/upl
o
ad-pack
u
pda
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Hamano
upl
o
ad-pack: fix thinko in com
m
on-commit
finder c
o
d
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Junio
C
Hamano
Cl
a
rify git sta
t
us output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hamano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
next