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
checkout: use --aggressive when running a 3-way merge (-m).
2006-05-10
Junio C
Hamano
c
h
ec
k
out: use
--aggre
s
s
i
v
e
w
hen running a 3-way m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Ham
a
no
Do
c
um
e
ntation: {caret} fixe
s
(
g
i
t-rev
-
l
ist
.
txt)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C
H
amano
F
i
x r
e
po-conf
i
g
set-multivar error return pa
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Junio
C
Ham
a
no
r
e
po-config: docum
e
nt
w
hat v
a
lue_re
g
exp does a bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
core
.
prefersymlinkrefs: use sy
m
lin
k
s for
.
g
i
t
/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Jun
i
o C Ham
a
n
o
git
-
am --
r
esolved: more usable error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Ju
n
io C Hamano
ver
i
fy-pack:
che
c
k
inte
g
ri
t
y
in a saner order
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
commit-tree
.
c:
check_valid() mi
c
rooptimizatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
rebase: typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-21
Junio
C Hamano
mailinfo: d
e
c
ode underscore use
d
i
n "Q" encoding prop
e
rl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-21
Jun
i
o C Hamano
pack-obj
e
cts: do not
s
top
at obj
e
ct that is "t
o
o small
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-20
Junio
C
Hamano
git-co
m
mit --am
e
nd: tw
o
fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-19
Junio
C Hama
n
o
pr
e
-
commit
hook: complai
n
about c
o
nflict markers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-19
Junio C
H
a
mano
git-merge:
a
b
i
t more readable user
g
uidan
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Juni
o
C Hamano
GIT
1
.
3
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Junio C Hamano
di
f
f
-
-
stat: make sure
t
o set recu
r
sive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-18
Junio C Hamano
packed_obje
c
t_info_det
a
il(): check
for corrupt packfil
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
Junio C Hamano
Merge branch
'
jc/boundary'
commit
|
commitdiff
|
tree
2006-04-17
Junio
C Hamano
Mer
g
e br
a
nch
'
j
c/bo
t
tomless'
commit
|
commitdiff
|
tree
2006-04-17
Junio C Hamano
rev-lis
t
--bound
a
ry:
show boundary commits even
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-17
Ju
n
io
C Hamano
Merge
git://git
.
kernel
.
org/pub/s
c
m/
g
i
t
k/gitk
commit
|
commitdiff
|
tree
2006-04-16
Junio
C
H
a
mano
readin
g
$
GIT
_
D
IR/info/graft
-
s
k
i
p
comments correct
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-16
Junio
C
H
aman
o
d
iff-files --stat: d
o
n
o
t
dump co
r
e wi
t
h u
n
merg
e
d inde
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
Junio C Haman
o
diff
--stat: do not do
i
t
s own
t
hr
e
e-dashes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
J
unio C Ham
a
n
o
dif
f
-
t
ree: typefix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
Junio C Ham
a
no
GIT v1
.
3
.
0
-rc4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-15
Junio
C Hama
n
o
Mer
g
e
branc
h
'dl/xdiff'
commit
|
commitdiff
|
tree
2006-04-15
J
u
nio C Hamano
Merge bra
n
ch 'js
/
d
i
f
f
stat'
commit
|
commitdiff
|
tree
2006-04-15
Juni
o
C Hamano
M
e
rge branc
h
'
jc/fix55
0
0'
commit
|
commitdiff
|
tree
2006-04-15
J
u
nio C Hamano
rev-list --bisec
t
: limit list before b
i
se
c
ti
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Ju
n
io C Hamano
"git
c
m
d -h" for
sh
e
ll scripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Junio C Ham
a
no
git-log <diff-options> <
p
aths> docu
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Juni
o
C Hamano
Re
t
ire git-log
.
sh (take #4)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
J
u
nio C Hamano
stripspa
c
e: incom
p
lete
line fix (take
#
2
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
J
u
n
io C H
a
ma
n
o
t
5500: te
s
t fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Ju
n
io
C Hamano
d
i
f
f --s
t
at: no
n
e
e
d
t
o ask funcnames nor context
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-14
Junio C Hamano
Fix-up prev
i
ous e
x
pr changes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
J
unio
C
H
a
mano
t3600-rm: skip faile
d
-remove test whe
n
we cannot ma
k
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Junio C
H
amano
git-log: do
not
o
utput excess blank
line between commits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Junio C Hamano
Mak
e
file: $(MAKE) check-
d
oc
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-13
Junio C Hamano
D
o
cum
e
n
t
at
i
on: add a couple of missing
d
ocs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-12
Juni
o
C Hamano
Merge
b
ranch '
j
c/co
m
b
i
ne
'
into next
commit
|
commitdiff
|
tree
2006-04-12
J
unio C
H
amano
Merge branch 'master' i
n
to
jc/combine
commit
|
commitdiff
|
tree
2006-04-12
Junio C
Hama
n
o
c
o
mbine-diff: type fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-12
Junio C Hamano
stripspace: ma
k
e
sure not to leav
e
an i
n
complet
e
line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-12
Junio C
Hamano
git-commit: d
o
not mu
c
k with comm
i
t mes
s
age when no_edit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
Junio C
H
aman
o
Retire t5501-old
-
f
e
tch-and-upload test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
Ju
n
io C
Hamano
Merg
e
branch 'jc/comb
i
n
e'
i
n
to next
commit
|
commitdiff
|
tree
2006-04-11
J
unio C Hamano
Merge b
r
anch '
j
c/diff' into n
e
xt
commit
|
commitdiff
|
tree
2006-04-11
Jun
i
o C
Haman
o
comb
i
ne-d
i
ff: fix
h
unks at the
e
n
d
(take #2)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
Junio C Hamano
combine-
d
iff: do no
t
lose hunks with only
d
eletion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
Junio C Haman
o
Me
r
ge branc
h
'ds/index' into ne
x
t
commit
|
commitdiff
|
tree
2006-04-11
Junio C Haman
o
Merge br
a
n
ch 'j
c
/
w
ithraw' into nex
t
commit
|
commitdiff
|
tree
2006-04-11
Juni
o
C Hamano
Retire
git-lo
g
.
sh (
t
ake #3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
Junio
C
H
amano
M
e
rge b
r
anch 'eb/app
l
y' into
next
commit
|
commitdiff
|
tree
2006-04-11
J
u
nio C Hama
n
o
Merge
b
r
anch 'jc/withraw' into n
e
xt
commit
|
commitdiff
|
tree
2006-04-11
Juni
o
C Hamano
dif
f
-
*
--patch-with
-
raw
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
J
uni
o
C
Ha
m
ano
Ret
i
re git-log
.
s
h
(take#2)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
Juni
o
C Hamano
b
lame and friends
:
adjust
t
o
mu
l
ti
p
l
e
path
s
pec
c
han
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-11
J
u
ni
o
C
Hamano
Retire git-l
o
g
.
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-10
Junio
C
Ham
a
no
git
l
og --ful
l
-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-10
Junio C
H
a
mano
tree-diff: do not assum
e
we use o
n
ly one
pa
t
hspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-10
J
unio C Hamano
Merge branch
'master
'
into jc/di
f
f
commit
|
commitdiff
|
tree
2006-04-10
J
unio C
H
amano
Merge b
r
an
c
h 'lt/re
v
'
commit
|
commitdiff
|
tree
2006-04-10
Junio C Hamano
Retire diffcore-pathspec
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-09
Juni
o
C
Hamano
Merge branch 'jc
/
d
iff' in
t
o next
commit
|
commitdiff
|
tree
2006-04-09
Junio C
H
am
a
no
git log [diff-tree opt
i
ons]
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-09
Junio C Hama
n
o
log
-
tree: s
e
parate major part of diff-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-09
J
unio C Ha
m
ano
diff
c
ore
-
renam
e
: fix merging back a
broken pair
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-09
Juni
o
C Hamano
diff:
fix o
u
tpu
t
of total-
r
ewri
t
e
di
f
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-09
Jun
i
o
C Hamano
git-
l
og: match rev-li
s
t
--abbre
v
and --abbrev-c
o
m
m
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-08
Junio C Hamano
M
erge bra
n
c
h 'ma
s
ter
'
into next
commit
|
commitdiff
|
tree
2006-04-08
Junio C Hamano
GIT 1
.
3
.
0-rc3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-08
Junio C Hamano
Merg
e
b
ranch '
k
h/s
v
n'
commit
|
commitdiff
|
tree
2006-04-08
Junio C
H
a
mano
Merg
e
branch 'jc/thin
p
ack'
commit
|
commitdiff
|
tree
2006-04-08
Jun
i
o C
Haman
o
M
e
rge branch 'jc/date'
commit
|
commitdiff
|
tree
2006-04-08
J
un
i
o C Haman
o
M
e
r
ge b
r
anch 'nh/http'
commit
|
commitdiff
|
tree
2006-04-08
J
uni
o
C Haman
o
Merge branch 'ew/rev-abbre
v
'
commit
|
commitdiff
|
tree
2006-04-08
J
u
ni
o
C Hamano
Merge branc
h
'jc/blam
e
'
commit
|
commitdiff
|
tree
2006-04-07
Junio C Hamano
M
e
rge branch
'
m
a
ster' i
n
t
o
next
commit
|
commitdiff
|
tree
2006-04-07
Ju
n
i
o C Ham
a
no
Mer
g
e git://git
.
ke
r
n
e
l
.
org/pub/scm/gi
t
k
/git
k
commit
|
commitdiff
|
tree
2006-04-07
Junio C
H
amano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2006-04-07
Junio
C
Hamano
c
o
unt-delta: ma
t
ch get_
d
elta_
h
dr_size() ch
a
nge
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-07
J
u
nio C Hamano
Merge br
a
nch 'jc/thinpack'
i
n
t
o next
commit
|
commitdiff
|
tree
2006-04-07
Juni
o
C Hamano
M
e
r
ge branch '
e
w
/
rev-a
b
brev' into
next
commit
|
commitdiff
|
tree
2006-04-07
J
u
nio C Haman
o
Me
r
ge branch 'j
c
/blame' into next
commit
|
commitdiff
|
tree
2006-04-07
J
u
nio
C
H
ama
n
o
Merge
branc
h
'k
h
/s
v
n' into next
commit
|
commitdiff
|
tree
2006-04-07
Ju
n
io C Hamano
re
v
-l
i
st --abbr
e
v-
c
ommit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-07
Junio C Ham
a
no
Thin
pack g
e
ne
r
ation: opt
i
m
i
zation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-07
J
unio C Hamano
Add Doc
u
menta
t
ion/technical/pack-format
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-07
J
u
nio C
H
amano
blame -S <an
c
est
r
y-file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-07
Junio C H
a
man
o
M
atch ofs/cnt
t
ypes in
diff in
t
erfa
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-06
Junio C Hamano
Mer
g
e bra
n
ch 'master' int
o
next
commit
|
commitdiff
|
tree
2006-04-06
J
u
nio
C
Ham
a
no
blame
.
c:
f
ix complet
e
ly broken ancestry traver
s
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-05
Juni
o
C Hama
n
o
Merge br
a
nch 'jc/date' in
t
o n
e
x
t
commit
|
commitdiff
|
tree
2006-04-05
Jun
i
o C
Hamano
date parsing: be frie
n
dl
i
er to our Eu
r
op
e
a
n
friend
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-05
Junio C Hamano
M
erge branc
h
'jc/blame' i
n
t
o ne
x
t
commit
|
commitdiff
|
tree
2006-04-05
Juni
o
C Ham
a
no
Merge br
a
n
c
h 'nh/http' into n
e
xt
commit
|
commitdiff
|
tree
2006-04-05
Junio C Ham
a
no
blame: use buil
t
-in xdi
f
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-05
Junio C Hamano
Merge
branch 'jc/c
l
one'
commit
|
commitdiff
|
tree
next