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
Junio C Hamano
Merge http:/
/
www
.
k
ernel
.
org/
p
ub/scm
/
gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C Ha
m
ano
Merge bra
n
ch
e
s 'j
c
/bran
c
h' an
d
'jc/rebase'
commit
|
commitdiff
|
tree
2005-11-18
J
unio C Hamano
Rewrite
r
ebase
t
o use git-format-p
a
t
ch piped
t
o gi
t
-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hama
n
o
gi
t
-b
r
anch:
-
f to forc
i
bly reset branc
h
head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Do not show
.
exe in g
i
t c
o
mm
a
nd list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
un
i
o C Hamano
Cy
g
win *mi
g
h
t* b
e
helped with NO_MMAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
git-p
r
u
n
e
: quo
t
e possibly empty $dryrun as parameter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C Hamano
g
i
t-am:
-
-bina
r
y;
docum
e
nt --resume
and --binary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C H
a
mano
Deal
w
ith binary diff o
u
tput fr
o
m GNU diff 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C
Hamano
Merge branch
'
tojunio' o
f
h
ttp://loc
k
e
.
c
atal
y
st
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hama
n
o
Add approxidate te
s
t calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
tes
t
s: binary diff application
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C
Hamano
diff: --fu
l
l-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
unio C H
a
mano
a
pply:
allo
w
-binary
-
replac
e
ment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C H
a
m
a
no
gi
t
-am: --resolved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hamano
git
-
apply: fail if a pa
t
ch cannot
b
e applied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C H
a
mano
g
it w
r
apper: basi
c
fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C
Hamano
sha1_file
.
c::add_packed_git(): fix type mismat
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C Ham
a
n
o
diff: make defau
l
t rename det
e
ction
l
imit configurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
Documentation:
d
o n
o
t blindly run 'cat'
.
git/HEAD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Juni
o
C
Hamano
Update to
p
o-order tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Ha
m
a
no
apply: fix binary
p
atch det
e
ction
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio C Hamano
Merge branch 'svn
u
p' of http://ne
t
z
.
smurf
.
nori
s
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Ju
n
io C
H
ama
n
o
Sepa
r
a
t
e LDFLAGS an
d
CFL
A
G
S
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C H
a
ma
n
o
M
e
rg
e
branch
'
s
v
nup' of h
t
tp://netz
.
smurf
.
noris
.
d
e
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C
Hamano
Rename lost+found to lost-f
o
und
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Debian: bui
l
d
-depend on libexpa
t
-de
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io C Hamano
Ignore b
u
il
t
git-lost
+
found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
Docum
e
ntatio
n
:
asciidoc sourc
e
s
are utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Hama
n
o
R
ename
.
g
i
t
/
lo
s
t+found to
.
git/lost
-
fou
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
Ha
m
a
no
git-
l
ost+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
amano
git-
p
rune: prune red
u
ndant
packs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
ama
n
o
m
e
r
ge-on
e
-file: use emp
t
y- o
r
c
o
mmon
-
base
c
ondinti
o
nally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C Ha
m
ano
Doc
u
mentati
o
n
:
g
it-app
l
y
--no
-
add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C Hamano
m
e
rge-one-
f
i
l
e: use common as b
a
se, instead
o
f
e
mptiness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Hamano
merge with /dev/
n
ull
a
s base,
i
nstead of punting O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Hamano
INSTALL: du
p
licate pyt
h
on r
e
quir
e
ments
f
r
om Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Hamano
Mer
g
e
bran
c
hes 'jc
/
sb' and 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
t120
0
: use --topo-order to keep
t
h
e
s
how-branch
output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Haman
o
Fully detect uninteresting commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
git-show-branch: tig
h
te
n
merge-base com
p
utation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Add te
s
t
case for
m
erge-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
merge-base:
a
void unnecessa
r
y postpr
o
cessin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
mano
merge-ba
s
e: fully contaminate the
well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
RPM: arc
h
submodule needs
t
la
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ham
a
no
o
ctopus: d
o
no
t
do AND'ed merge b
a
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Hamano
Add
-
-pretty=
f
uller
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C
Ham
a
no
Do
no
t
lose author name
i
nforma
t
i
on to locale got
c
ha
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Docu
m
entation: "hos
t
:p
a
th/to/repo" is git native over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
J
unio
C Ha
m
ano
Make gi
t
-rec
u
rsive t
h
e d
e
fault strategy
for git
-
pu
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
i
o
C Hamano
Use 'me
r
ge-base --all
'
where
ap
p
l
i
c
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io C Hamano
Merge br
a
n
ch 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
Jun
i
o
C Hama
n
o
M
erge branch
'ho
l
d
/
rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hamano
git-apply: do not fai
l
on binary diff whe
n
not applying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Ha
m
ano
U
p
date INSTALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Clean build annoyance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hama
n
o
F
ix a cou
p
le of
o
bvious and
i
nsignific
a
nt t
y
po
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
H
amano
git-a
m
: do not l
o
se already edite
d
final-
c
ommit
whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Hamano
Debian: packa
g
ing
u
pdate
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Tutori
a
l
: do
no
t
use 'git resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
H
amano
D
o
cumentation: fi
x
d
e
pendency
generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Ignore more generated
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix
d
ocumentation dependency generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
H
a
mano
Documentation: as
c
iidoc formatting fix for
g
it-cvsexp
o
rtcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Do not fail
o
n
hierarchical
t
agnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Ham
a
no
Rec
o
v
er dropped +x bit from
g
i
t
-
pull
.
s
h
by a
c
c
i
dent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
amano
Documentatio
n
: t
a
lk about guts of merge in tut
o
rial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
nio C H
a
mano
Set up
r
em
o
t
es/origin to track al
l
remote b
r
anches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
git-
s
t
atus: do not mark unmerged p
a
t
h
s as com
m
ittab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Haman
o
ls-files: --other
s
s
houl
d
not say
u
nme
r
ged paths are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
ni
o
C Hamano
Document expat de
p
endency when using http-pus
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C
H
amano
Merge in http-pu
s
h
fir
s
t stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Debia
n
: test build
.
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
Jun
i
o C Haman
o
Install asciidoc sourc
e
s a
s
we
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
P
a
ckage spli
t
: De
b
ia
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Hamano
Simplify
C
FLAGS
/
DEFINES in Mak
e
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
git
-
fe
t
ch: fail
i
f specified ref
s
pec does not
match
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
i
o
C
Hamano
D
ocumentation: p
u
ll/clone ref mapping clarif
i
catio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
git-
f
ormat-patch: silly t
y
p
o f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
mano
tes
t
: t4102-apply-ren
a
m
e
fa
i
ls wit
h
strict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio
C
Hamano
git-clone: f
i
x local cl
o
ne
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C Haman
o
i
n
it-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
Ham
a
no
copy
.
c::copy_fd()
-
do not leak fi
l
e des
c
riptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C Hamano
Doc
u
men
t
a
tion:
format-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C Hamano
for
m
at
-
pat
c
h: "rev1
.
.
" shoul
d
mean "rev1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Documenta
t
i
on: g
i
t-fetch/pull
u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Hamano
Docume
n
t th
e
-
-no-commit flag
better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hama
n
o
Doc
u
m
e
ntation:
-
m
e
r
ge and -pull
:
describe m
e
rge strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C Hamano
Documentation
:
g
it-a
d
d -- do not say "cach
e
", add examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
unio C Hamano
git-ta
g
: Do not assume the working t
r
ee root is writable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
l
l
ustration: "Commit DAG
R
e
v
ision
N
aming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Illustration: "Gi
t
Diff Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C
H
amano
Ill
u
stration: "
F
undament
a
l Git Index
Operations"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
g
i
t
-
merge
-
o
urs: make sure our index matches HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Add 'ours' merge stra
t
e
g
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Add
--no-commit to git-m
e
rge/git-p
u
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Docum
e
nt --since and
-
-until o
p
tions to rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hama
n
o
B
e c
a
reful when de
r
e
ferencing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Ignore '\r
'
at the end of line in $GIT_DIR/conf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next