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 http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19
J
u
nio C Hamano
M
e
rge htt
p
://ww
w
.
ker
n
el
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ham
a
no
Merge bran
c
hes 'jc/b
r
a
n
ch' and 'jc/rebase'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ha
m
a
no
Rewrite rebase
t
o
use gi
t
-format-
p
atch pi
p
ed to
g
i
t
-am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C Hamano
git-b
r
a
nch:
-f to forcibly reset
b
ranch head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ham
a
no
Do not s
h
ow
.
exe in git com
m
and
l
ist
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
J
u
n
io C Hamano
C
ygw
i
n *might* be
he
l
ped with NO_MMAP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C Ham
a
no
g
it-prun
e
:
qu
o
te possibly empty $
d
ryrun as pa
r
ameter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C Hamano
git-am: --binar
y
;
document --re
s
ume
a
n
d
--bi
n
a
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C
Ha
m
ano
D
e
al with binary
diff output fro
m
G
N
U diff
2
.
8
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
Merge
b
r
anch 'tojunio' o
f
http://locke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
Add approxidat
e
test ca
l
ls
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
tests:
bi
n
ary diff applicat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Ha
m
a
n
o
diff
:
--full-index
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
apply: allow-bin
a
r
y-r
e
place
m
ent
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Juni
o
C Hamano
gi
t
-am:
-
-resolved
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
J
unio C Hamano
git-apply: fail if a
patch c
a
nnot
be appli
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hamano
g
i
t w
r
apper: bas
i
c fi
x
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
io C Hamano
sha1_f
i
le
.
c::add_packed
_
git()
:
fix type mismatch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
J
unio C Hamano
diff: make
d
e
fault rena
m
e
d
etec
t
io
n
limit config
u
rable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
Documen
t
a
t
ion: do not blindl
y
ru
n
'cat'
.
git/HEAD,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C
Hamano
Update t
o
po-
o
rder t
e
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Juni
o
C
Hamano
apply:
fix binary patch detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Merge
b
r
a
n
ch 'svnu
p
' of http:
/
/netz
.
smurf
.
noris
.
de
.
.
.
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
H
a
mano
Me
r
g
e
branch
'
svnup
'
of http://netz
.
s
m
urf
.
n
oris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
J
uni
o
C
Hamano
Rename lost+found to los
t
-
found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-13
J
unio C H
a
mano
Debian: buil
d
-depend on li
b
expat
-
dev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C Hamano
I
g
nore b
u
ilt g
i
t-lost+found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
u
n
i
o C H
a
mano
Documentation: asciidoc sour
c
es are utf-8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C Hamano
Ren
a
me
.
git/lost+found to
.
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-lost+found
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Haman
o
git-p
r
une
:
prune redu
n
dant packs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Hamano
m
erge-o
n
e-file: us
e
empty- or common-ba
s
e condint
i
onal
l
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C Hamano
Document
a
tion: g
i
t-app
l
y
--no-a
d
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
amano
me
r
ge-one
-
file: use common as b
a
se, instead of empt
i
ness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
Hamano
merge with /dev/null as
base, instead of
punting O
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
INST
A
LL: duplicate pytho
n
requireme
n
ts from Ma
k
e
fi
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
Merge branches '
j
c
/sb' and 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
m
a
no
t1200: use --topo-order to keep the
s
h
ow-branch output
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
Fully
d
ete
c
t
uninteresting
c
ommits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o
C
Ha
m
an
o
git-show-bra
n
ch: tighten
merge-base comput
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
A
d
d test case for
m
erge-base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C H
a
mano
merge-base: avoid unnecessary postpr
o
cessing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hama
n
o
merge-base: fully contaminate the well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C H
a
mano
RPM: ar
c
h
sub
m
o
d
ule needs tla
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
octopus:
do
n
ot do
AN
D
'ed
merge base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
Add --pretty=fuller
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ha
m
ano
D
o not lose author
name info
r
m
a
t
i
o
n
t
o
locale go
t
chas
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
Documenta
t
ion: "ho
s
t:path/to/repo" is git
native
over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Make
g
it-re
c
ur
s
ive th
e
default
strategy for git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C
H
amano
Use 'm
e
rge-base
-
-al
l
' wh
e
re app
l
icable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
M
e
rge branch
'hold/sv
n
'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
M
erge branch 'hold/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hamano
git-apply: do not
f
ail on binary diff
when not app
l
ying
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hama
n
o
Updat
e
INS
T
ALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ham
a
no
Cl
e
an build annoyance
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
i
o
C Hama
n
o
Fix a couple of obvious and insigni
f
i
c
ant typ
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
aman
o
g
it
-
am: do no
t
lose
a
lready edited final-commit when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hama
n
o
Debian:
p
a
c
k
aging
u
pdates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ha
m
ano
Tutorial: d
o
not u
s
e 'git resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hama
n
o
Documentation: fix
dependency ge
n
eration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
Ignore more generated f
i
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix documentation dependency gener
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C
H
a
mano
Do
c
umentati
o
n: asc
i
idoc formattin
g
fix for git-c
v
sexpo
r
tcomm
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
o
not fail on
h
ierarchical tagnam
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Recover dropp
e
d +x bit from git-pull
.
sh
b
y accident
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Ham
a
no
D
o
cumentatio
n
: t
a
lk
a
bout guts of merge
in tutor
i
al
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
u
nio C H
a
m
a
no
Set
u
p remotes/origin to track all re
m
ote
br
a
nches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
u
ni
o
C H
a
mano
g
i
t-status: do
not ma
r
k unme
r
ged paths a
s
committable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io C Hamano
ls-files: --
o
thers should not sa
y
u
nmerged paths
are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
D
ocument expat depend
e
ncy when using http-push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io
C
H
amano
M
e
rge in http-
p
ush fir
s
t stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
D
ebia
n
: te
s
t build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
mano
F
urther Debian spli
t
fixe
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Install as
c
i
i
d
oc s
o
urces a
s
w
ell
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
P
a
c
k
a
g
e
split:
D
ebian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Simplify CFLAGS/DEFINE
S
i
n
M
akef
i
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
git-fetch: f
a
il if speci
f
i
ed refspec
does not m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
no
Do
c
um
e
ntation: pul
l
/clone ref mapping clari
f
ication
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
git-format-
p
a
tch
:
s
i
lly typ
o
fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C Hamano
t
est: t4102-a
p
ply-
r
e
nam
e
fails with strict umask
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o
C H
a
m
a
no
git-clo
n
e: fix local
clon
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C
H
amano
init-db::cop
y
_file
(
) - use copy_f
d
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
a
mano
copy
.
c
:
:copy_fd() - do n
o
t leak file
descripto
r
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C Hama
n
o
Docu
m
entation: fo
r
ma
t
-patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C Hamano
fo
r
ma
t
-patch
:
"rev1
.
.
" shou
l
d me
a
n "rev1
.
.
HEAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Docu
m
e
n
t
ation
:
git-fetch
/
pull updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
m
a
n
o
Docu
m
e
nt the --no-
c
ommit flag better
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C H
a
mano
Docu
m
enta
t
ion: -merg
e
and -pull: describe merg
e
st
r
ategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Ha
m
ano
Documentation: git-add -- do not sa
y
"
c
ache", add examples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io C
Hamano
git
-
tag: Do n
o
t assume the
work
i
ng tre
e
r
oot is writable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illust
r
a
tion:
"
Commit DAG R
e
vision Naming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Il
l
ustration
:
"Git Diff Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Illustration: "Fun
d
amental Git Index Oper
a
tio
n
s
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
git-merge-ours:
m
ake sure our in
d
ex mat
c
hes HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Ha
m
ano
Add
'
ours' me
r
ge
s
tra
t
egy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C
Hamano
Add --no-commit to
git-m
e
rge/git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o
C Hamano
Document --since
a
nd --until options to rev-pars
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Be careful when der
e
ferencing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
g
nore '\r' at the e
n
d of line in $
G
IT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next