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/branch' and 'jc/rebase'
2005-11-18
Ju
n
i
o
C
H
amano
Merge b
r
anche
s
'jc
/
branch
'
and 'jc/rebase'
commit
|
commitdiff
|
tree
2005-11-18
J
unio
C Ha
m
a
n
o
Rewrit
e
rebase to us
e
g
i
t-format-patch piped
t
o g
i
t-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C Hamano
git-b
r
anc
h
: -f t
o
forcibly reset
b
r
anch head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Do
n
ot
show
.
exe i
n
git com
m
and list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C H
a
mano
Cygwin
*mi
g
ht* be helped
with NO
_
MMAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C Haman
o
git
-
prune: quo
t
e pos
s
ibly empty $dry
r
un as pa
r
a
m
eter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io
C
Ham
a
n
o
git-am: --binary; docume
n
t --resume and --binary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
D
eal with
b
inary di
f
f ou
t
put from GNU d
i
ff 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hama
n
o
Me
r
ge branch
'tojunio'
o
f
http://locke
.
ca
t
a
lyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C H
a
ma
n
o
Add
approxid
a
te test calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Ha
m
ano
te
s
ts: binary diff a
p
plicat
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Juni
o
C Haman
o
d
i
f
f
:
--full-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
apply: a
l
lo
w
-bin
a
r
y
-repl
a
cement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C
H
a
m
a
no
git
-
am: --resolv
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
J
unio C Hama
n
o
git-apply
:
fail if a patch cannot be appl
i
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hamano
git wr
a
pper: basic fix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
sha1_fi
l
e
.
c::add
_
pa
c
ked_git(): f
i
x type
m
ismatch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
u
n
io C Hamano
diff:
make default rename d
e
tecti
o
n li
m
it config
u
rable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Juni
o
C
H
amano
Document
a
tion: do not blindly run 'c
a
t'
.
git/H
E
AD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
unio C H
a
mano
Update
t
o
po-order
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Jun
i
o C Haman
o
apply: fix binary pat
c
h detecti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio
C
Hamano
M
erge b
r
anch 'svnup' of http://netz
.
s
m
urf
.
noris
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hama
n
o
Sep
a
rate L
D
FLAGS
a
nd CFLAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio
C
Hamano
M
e
rge branch
's
v
nu
p
' of http://netz
.
smurf
.
nori
s
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Jun
i
o C Hamano
Rename lo
s
t+fou
n
d t
o
l
ost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
D
e
b
ian: build-depend
on
libexpa
t
-d
e
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
a
m
an
o
Ignore built git
-
lost+found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ham
a
no
Doc
u
mentation:
asciidoc so
u
rces are utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C Hamano
Rena
m
e
.
git/lost+found to
.
git/lost
-
found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io C Hamano
git-lost
+
f
o
u
nd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
Hamano
git-prune: p
r
une redundant pack
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge-one-file
:
u
se
e
mpty- o
r
c
ommon-base cond
i
ntionally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ham
a
n
o
Documen
t
atio
n
: git-ap
p
l
y
--no-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
m
erge-one-fil
e
: use common as ba
s
e
,
instead
of
emptiness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
merge with /dev/nul
l
as
b
ase, instead o
f
punting O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Haman
o
INSTALL: duplicate python require
m
ents from Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Merge bra
n
c
hes 'jc/sb' and 'jc/
m
b'
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Haman
o
t120
0
: use --topo-order to kee
p
the show-branch output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Full
y
detect unint
e
resting commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
git-show-branch: tigh
t
en merge-base comput
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
Add test case for me
r
ge-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
merg
e
-base: avo
i
d unnecessary post
p
r
o
cessing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Haman
o
merge-base: fully co
n
tamin
a
te
t
he
w
ell
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Hamano
R
P
M: a
r
ch sub
m
odule
needs tl
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hama
n
o
octopu
s
: do not do AND'ed merge base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o
C Hamano
Add --pr
e
tt
y
=fuller
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
a
mano
Do
not lose author
name infor
m
ation
t
o
locale gotch
a
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
i
o
C Hamano
Documentation: "host:p
a
th/to/repo" is git native
over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C H
a
ma
n
o
Make
g
it-recu
r
si
v
e the de
f
a
ul
t
s
t
r
a
teg
y
for git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hama
n
o
U
s
e 'merge-base
--al
l
' where applicable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C Hamano
Merge
bran
c
h 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Mer
g
e branc
h
'hold/
r
pm'
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hama
n
o
git
-
app
l
y: d
o
not f
a
il on b
i
n
a
r
y
di
f
f
when not appl
y
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hamano
Update
I
N
STALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
a
m
ano
Clean
build a
n
noya
n
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hamano
Fix
a
coup
l
e of obvious and insign
i
fic
a
nt typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C
H
amano
git-am
:
do not lose
a
lread
y
edited final
-
c
o
m
mit whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
uni
o
C Hamano
Debian: packaging updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
i
o
C
Hamano
T
u
t
o
rial: do not use 'git reso
l
ve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
D
o
cumenta
t
ion:
fix depen
d
enc
y
generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ha
m
ano
Ignore m
o
re
g
e
n
e
r
at
e
d
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Hama
n
o
Fix d
o
cument
a
tion depe
n
d
e
n
cy generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
n
i
o C H
a
mano
Documentation: asciidoc formatting fi
x
f
o
r
g
it
-
cvsexportcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Do n
o
t fail
o
n hie
r
archical tagname
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
a
mano
Recover droppe
d
+x bit
f
rom git-
p
ull
.
sh
by accide
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
nio C Hamano
Docu
m
e
ntation: talk abo
u
t guts of merge in
tuto
r
i
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
S
e
t up rem
o
t
e
s/
o
rigin to track
a
ll re
m
ote branches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io
C
Ham
a
no
git-status: do not mark un
m
erged paths as commi
t
ta
b
le
.
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 say unm
e
rg
e
d paths are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
mano
D
ocu
m
en
t
expat
dependency whe
n
using http-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Ham
a
no
Mer
g
e in http-
p
ush first stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
Debian: test bu
i
ld
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Further Debian split fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Install ascii
d
oc sour
c
es as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
Package
s
plit: Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
Sim
p
l
i
fy CFLAGS/DEFINES in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hamano
git-f
e
t
c
h: fail if spe
c
i
fied
refsp
e
c
do
e
s not matc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Docume
n
tation
:
pu
l
l/clone
r
e
f map
p
i
n
g
clarifi
c
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
git-format-
p
atch: si
l
l
y
typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ham
a
no
test: t4102-a
p
ply-rename fails
with
s
t
r
ict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
g
it-cl
o
ne
:
fix local clone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
init-db::copy_file() - use
c
op
y
_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
c
op
y
.
c
:
:copy_fd() - do not leak file descr
i
ptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
uni
o
C
Haman
o
Documentat
i
on: format
-
p
a
tch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C
H
amano
format-
p
a
tch: "rev1
.
.
" shoul
d
mean
"
rev
1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C Hamano
Docu
m
en
t
ation: git-fe
t
c
h
/
pull updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C H
a
mano
Docume
n
t the --no-commit f
l
ag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C Ham
a
no
Doc
u
men
t
ation
:
-merge and
-
pu
l
l
: descri
b
e merge s
t
rategie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
Document
a
tio
n
: git-add
-
- do not say
"
cache", add examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
git-t
a
g: Do not assume th
e
working
t
ree
r
oot is
w
ritable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
I
llustration: "Commit DAG Revision Naming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
mano
I
l
lustration:
"
Git
Diff Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hamano
Il
l
u
s
tr
a
tion: "Fund
a
mental Git I
n
dex Opera
t
ions"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
un
i
o C H
a
mano
git-merge-
o
urs: ma
k
e
sure our
index match
e
s H
E
AD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Ha
m
ano
A
dd 'ours
'
merge
st
r
ategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C
Haman
o
Add --no-commit t
o
gi
t
-merge
/
gi
t
-pul
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
io
C
Hamano
Docu
m
ent --s
i
nc
e
and
-
-
unt
i
l options to r
e
v-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Ha
m
ano
Be
careful when dereferencin
g
tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
i
o
C Hamano
Ignor
e
'\r' at
t
he end of line in $GIT_D
I
R/c
o
nf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not fail
o
n
hiera
r
chical branch names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next