repo.or.cz
/
git
/
mingw
/
4msysgit.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
Junio C H
a
mano
Merge
bra
n
ches 'jc/branch'
a
nd '
j
c/
r
e
base'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Rewr
i
te reb
a
s
e
to use git
-
format-patch
p
iped to git
-
am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ham
a
no
git-bra
n
ch: -f to f
o
rcibly reset branc
h
h
ead
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Do not show
.
exe in git command list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Cygwi
n
*might* be helped with NO_MM
A
P
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
git-prune
:
q
u
ot
e
possi
b
ly empty $dryrun as parameter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
git-am
:
-
-binary;
d
ocument --resume an
d
--binary
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C
Ham
a
no
Deal with b
i
na
r
y diff
o
utput from GNU diff
2
.
8
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
J
u
nio C Ham
a
no
Me
r
ge bran
c
h 't
o
junio' of ht
t
p:
/
/
l
ocke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Juni
o
C Hamano
Add approxidate test calls
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C
Ham
a
no
tes
t
s:
binary d
i
ff application
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Ha
m
an
o
di
f
f:
--ful
l
-index
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
apply: allow-binary-repl
a
cement
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Juni
o
C
Ha
m
ano
git-am:
--r
e
solved
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Juni
o
C
Hamano
git-apply:
fail if a pat
c
h cannot be appli
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Juni
o
C H
a
m
ano
git wra
p
per: b
a
s
i
c fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C Hamano
s
ha1_fil
e
.
c::add_packe
d
_git(): fix t
y
pe mismatch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
diff: make d
e
f
a
ult renam
e
detec
t
i
on
limit co
n
figurable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C
H
a
ma
n
o
Docume
n
tation: do not bl
i
nd
l
y run 'cat'
.
git/HEAD,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
Upda
t
e topo-order test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C
H
amano
a
p
ply: fi
x
binary patc
h
d
ete
c
tio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
M
erge branch '
s
vnup'
o
f
htt
p
://netz
.
smur
f
.
noris
.
d
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Separate
LDFLAGS and CFLA
G
S
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C
Ha
m
ano
Merge branch
'svnup' of http://netz
.
sm
u
r
f
.
noris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio
C Ham
a
no
Rename
l
os
t
+found
to lost-found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-13
Junio C H
a
mano
D
e
bian: build-depend o
n
libexpat-dev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
Ignore
b
uilt
g
it-lost
+
found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Documentation:
a
s
c
iidoc s
o
urces are
u
t
f-8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
R
e
na
m
e
.
git/lost+found to
.
git/lost-found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Haman
o
git-lost+foun
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
git-
p
run
e
:
p
rune red
u
n
da
n
t packs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
merge-one-file
:
us
e
empty
-
o
r
c
om
m
on-
b
ase c
o
ndintional
l
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C H
a
mano
Docume
n
tation: git-apply --no-add
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
m
erge-one
-
fil
e
: use co
m
mon as
base, ins
t
ead of empt
i
n
e
ss
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
merge with
/dev/n
u
l
l
as ba
s
e, instea
d
of punting O
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Hamano
I
NSTALL: duplicate
p
y
t
hon re
q
uirements
f
rom Makefile
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
Junio C Hamano
t12
0
0: u
s
e --top
o
-
o
rder
to
k
eep
the s
h
ow-branch outpu
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Fully det
e
c
t
uninteres
t
ing commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
git-
s
how-branch: tigh
t
e
n
merge-ba
s
e computation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Hamano
Ad
d
t
est case for merge-base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C
Hamano
merge-base: a
v
oid unnec
e
ssary postprocessing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
mano
merge-
b
ase: fully co
n
tam
i
n
at
e
the well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
io C Ha
m
an
o
RPM: a
r
ch
submodule needs tla
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
i
o
C H
a
mano
o
cto
p
us
:
do n
o
t do AND'ed merge base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ham
a
no
A
d
d --pretty=
f
u
lle
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Do not lose author name information to locale gotchas
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
a
mano
D
o
cumentation:
"
host:p
a
t
h
/to/repo" i
s
git native
o
v
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C
Hamano
Make git-recursive th
e
d
e
f
a
ult strategy for git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Use 'mer
g
e-base --all' where appl
i
cabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
J
unio C Hamano
Merge branch
'
h
old/sv
n
'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Merge
branch
'h
o
l
d
/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio C
H
amano
gi
t
-apply:
do not fail on binary diff when not applyin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Ha
m
ano
Update INS
T
ALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C Hamano
Clean build
a
nnoyance
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
amano
Fix a couple of
obvi
o
us and
i
nsignificant typo
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
u
n
io
C Hama
n
o
git-am: do not lose
a
l
r
eady edited
f
inal-com
m
it when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
ebian: packaging u
p
d
a
te
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Ha
m
ano
Tutorial: do
n
ot u
s
e 'git resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
amano
Documen
t
a
tion: fix depende
n
cy g
e
neration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io
C
Hamano
Ignore more gene
r
ated fil
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Haman
o
Fix document
a
t
ion dep
e
n
d
ency gen
e
ration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hamano
Documentat
i
on: as
c
iidoc for
m
a
t
t
i
ng
fix for git-cv
s
ex
p
ortcomm
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
o no
t
f
a
i
l on hierar
c
hical tagnames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C Hamano
Recover dropped +x b
i
t f
r
om git-pull
.
sh by accident
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C H
a
m
a
n
o
Doc
u
mentation: talk about guts of
merge
i
n t
u
torial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Set up remote
s
/ori
g
in
to
t
rack
all r
e
m
o
te
br
a
nc
h
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
amano
gi
t
-status: do
n
o
t
mark unmerged paths as commit
t
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
ls-fil
e
s: --ot
h
ers shou
l
d not say unmerged
p
at
h
s
a
r
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
Document e
x
p
a
t dependency when
us
i
ng ht
t
p-push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
no
Merg
e
in http-push
f
irst stag
e
.
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C
Hamano
Debian: t
e
st build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Further D
e
b
i
an sp
l
it fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
I
nstall asciidoc sources as
w
ell
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
P
a
ckage
s
plit:
D
ebian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
Simplify CFLAGS/DEFINE
S
in Mak
e
f
i
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
git
-
fetc
h
: fail if specified re
f
spec does not match
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio
C
Hamano
D
o
cume
n
tation: p
u
l
l
/
clo
n
e ref ma
p
ping c
l
arification
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
git-forma
t
-p
a
tch:
silly typo fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
te
s
t: t4102-
a
pply-rename fai
l
s
w
i
t
h
strict umask
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C
H
amano
g
i
t-
c
lone: f
i
x local clone
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Hamano
init-db::copy_file() - use copy_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C
Hamano
co
p
y
.
c
:
:c
o
py_f
d
() - do not leak
f
i
le descrip
t
o
r
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io C H
a
mano
Documentation: for
m
at-patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio
C
Hamano
f
ormat-patch: "rev1
.
.
" sh
o
ul
d
mean "rev1
.
.
HEAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
a
ma
n
o
Docum
e
nta
t
ion: git-fetch/pull updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
Docume
n
t
t
he
--no-commit flag
better
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C Hamano
Documentation: -merge and -pull: des
c
r
i
be
m
erge stra
t
egies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C Hamano
Documentation: g
i
t-add -- do not sa
y
"cache", add e
x
am
p
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
unio
C Ha
m
ano
g
it-tag: Do not
a
ssum
e
the work
i
ng t
r
ee root 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 Revision Naming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
Illustration: "Git D
i
ff
Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C
Ham
a
n
o
Illustration:
"Fundame
n
tal Git In
d
ex Operations
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
git-merge-ours
:
make
sure our
index matches HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
Add 'ours' merge strat
e
gy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add --
n
o-commit t
o
g
it-m
e
rge/g
i
t
-
pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio
C
H
a
mano
Doc
u
ment --since and --
u
ntil options
t
o
rev-par
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
B
e ca
r
efu
l
when d
e
refe
r
encing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
mano
Ignore '\r' at the end of line in
$G
I
T_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not fail on h
i
erarchical
bran
c
h
na
m
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next