repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add test case for recursive merge
2006-11-05
Junio C
H
am
a
no
cherry is built-in, do not ship git-cherry
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
git-pic
k
axe: f
i
x
origin
r
e
f
counting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
J
u
nio C Hamano
Merge branch '
n
p/verbose-pu
s
h'
commit
|
commitdiff
|
tree
2006-11-05
J
unio C
H
amano
Merge branc
h
'lt/push-config'
commit
|
commitdiff
|
tree
2006-11-05
Junio C
H
amano
Merge br
a
nch 'pb/w
e
b'
commit
|
commitdiff
|
tree
2006-11-05
Junio C Ha
m
an
o
g
it-pickaxe
:
re-scan the
b
lob after mak
i
ng progress
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Junio C Ha
m
ano
git-pickaxe: re-scan
the
bl
o
b after making progre
s
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Junio C Hamano
git-pickaxe: s
i
mplify
O
c
topus merges further
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Junio
C Hamano
git-p
i
ckaxe: r
e
name de
t
ection opti
m
i
zation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Ju
n
io
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-11-04
Junio C H
a
mano
apply: ha
n
dl
e
"traditional" c
r
e
a
t
ion/deletion diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-03
Junio C
H
ama
n
o
Me
r
ge branch 'master'
i
nto np/index-pack
commit
|
commitdiff
|
tree
2006-11-03
J
u
nio C Hamano
Mer
g
e branch '
s
p/ke
e
p-pack' into n
p
/index-pack
commit
|
commitdiff
|
tree
2006-11-03
Junio
C Haman
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-03
Ju
n
io C
Hamano
for-e
a
ch-ref:
"cre
a
tor" an
d
"
creatordate" field
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-01
Junio C Hama
n
o
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2006-11-01
Junio C Hamano
b
r
an
c
h: work in subd
i
rectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-01
Junio C H
a
m
a
no
M
e
r
g
e br
a
nch 'rs/c
h
erry'
commit
|
commitdiff
|
tree
2006-11-01
Junio C Haman
o
Merge branch 'jc/refs-a
n
d-fetch'
commit
|
commitdiff
|
tree
2006-11-01
Junio
C Ha
m
ano
Merge
branch
'lj/
r
efs'
commit
|
commitdiff
|
tree
2006-10-31
J
unio C Hamano
link_temp_t
o
_file: don't le
a
ve the pat
h
truncated
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Junio C Hamano
Introduce a n
e
w revision set operat
o
r <rev>^!
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Jun
i
o C Haman
o
git-pickax
e
:
c
a
che
o
ne already found path per commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Junio C H
a
mano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-10-31
J
u
nio C
Hamano
revision t
r
aversal: --unpack
e
d does not limit commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Jun
i
o C H
a
mano
git-pickaxe: split find_origin() into find_rename(
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Junio C Hamano
quote
.
c: ensure the s
a
me quoting across platform
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Juni
o
C Ha
m
a
n
o
Reve
r
t
"send-pack --ke
e
p: do
n
ot exp
l
ode into lo
o
s
e
.
.
.
commit
|
commitdiff
|
tree
2006-10-30
J
unio C
Hamano
Surround
"#defi
n
e
DEBUG
0
" with "#if
n
def D
E
BUG
.
.
#
en
d
if"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-30
Junio C Ha
m
ano
git-pickaxe:
t
i
g
hten sanity checks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-30
J
unio C Ham
a
no
git
-
pick
a
xe
:
re
f
count origin correctly
i
n
find_co
p
y_in
_
par
e
nt(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-30
J
u
nio
C
Hamano
git-pickax
e
: al
l
ow -Ln,m as
w
ell
a
s
-L
n
,m
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-29
J
u
nio C Hama
n
o
git-pickaxe: WIP to refcount origin struct
u
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-29
Junio C Hamano
Merge early part
of
bra
n
c
h 'np/inde
x
-pa
c
k
' into sp
.
.
.
commit
|
commitdiff
|
tree
2006-10-29
Junio C
H
amano
send
-
p
ack --keep: do not explode into loose
o
bje
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Junio C
H
a
mano
Documen
t
a
t
ion: fix git-format-pat
c
h
ma
r
k-up
a
nd link
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Juni
o
C Hamano
t6022
:
ignoring untracked files by
m
erge-re
c
ursive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Jun
i
o C Hamano
merge-recursive: adj
u
st to l
o
o
s
ened "working file clo
b
bered
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Junio C Hamano
me
r
ge-
r
ecursive: make a
f
e
w
f
unctions
s
t
a
t
ic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Junio C
H
amano
merge-recursive: use ab
b
reviated
com
m
it
o
bject nam
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
J
u
ni
o
C H
a
m
a
no
m
e
rge: loosen ove
r
c
a
ut
i
ous
"
w
o
rki
n
g file will be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-27
Junio C Hamano
tests: merge
-
r
e
cursive is usab
l
e
w
ithout Pyth
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-27
Juni
o
C Ham
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-10-27
Juni
o
C
Hamano
M
erg
e
branch 'jc/reflog'
i
nto lj/refs
commit
|
commitdiff
|
tree
2006-10-27
J
unio
C Hamano
Merge branch
'jc
/
combined'
i
nt
o
maint
commit
|
commitdiff
|
tree
2006-10-26
Junio C Hama
n
o
M
e
rg
e
branch 'jc/co
m
bined'
commit
|
commitdiff
|
tree
2006-10-26
Junio C Hamano
combine
-
d
iff: honour --no-commit-id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-26
Juni
o
C
H
a
mano
c
ombine-di
f
f: fix hunk_comment_l
i
ne logic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-26
Junio C Hamano
Mer
g
e branch 'jc/combi
n
ed
'
commit
|
commitdiff
|
tree
2006-10-26
Junio C Ha
m
ano
c
ombine-diff: a few more finish
i
ng touch
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-26
Juni
o
C Hamano
D
ocu
m
e
n
t
ation
:
c
l
a
r
i
f
y r
e
fname disam
b
iguat
i
o
n rules
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-25
Junio
C
H
a
ma
n
o
M
e
r
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2006-10-25
Junio
C Hamano
Docume
n
tation/SubmittingPa
t
c
h
es: 3+1 != 6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-25
Junio C Ha
m
ano
M
erge bra
n
ch 'aw/cvsimport'
commit
|
commitdiff
|
tree
2006-10-25
Junio C Ha
m
a
n
o
Me
r
ge branch 'jc/web'
commit
|
commitdiff
|
tree
2006-10-25
Juni
o
C Hamano
M
erge for-
e
ach-ref to sync gitweb fu
l
ly with 'nex
t
'
commit
|
commitdiff
|
tree
2006-10-25
Junio
C Hamano
Merge
b
ranch
'
jc/web-blam
e
'
commit
|
commitdiff
|
tree
2006-10-25
Juni
o
C
Hama
n
o
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-10-25
Junio C Ham
a
no
Update che
r
ry
docu
m
entat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-25
Junio C
Hama
n
o
R
efer to git-rev-parse:Spe
c
ifying Re
v
i
s
ions from git
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-25
Junio C Hamano
RPM pack
a
ge re-classification
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-24
Juni
o
C Hamano
Docume
n
tation: note abou
t
c
o
ntr
i
b/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-24
J
u
n
i
o C Haman
o
t3200:
git-branch te
s
ts
u
it
e
update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-24
Junio C Haman
o
sha1_
n
ame
.
c: a
v
oid
compil
a
t
ion warnin
g
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-24
Junio C Hamano
Merge branch 'maste
r
' into jc/web
commit
|
commitdiff
|
tree
2006-10-24
Junio
C
Ha
m
ano
Me
r
ge bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2006-10-24
Juni
o
C H
a
m
a
no
daemon: do
n
ot die
o
n older clients
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-23
J
u
n
i
o C H
a
man
o
Merge branch 'np
/
p
a
ck'
commit
|
commitdiff
|
tree
2006-10-23
Junio C Ha
m
ano
Merge
b
ra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2006-10-23
Junio C Hamano
p
a
g
e
r: default to LESS=FRSX not LESS=FRS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
Junio C Ham
a
n
o
git
-
pickaxe: s
w
ap comparison
loop used for
-C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
Junio C Ha
m
a
no
git-p
i
ckaxe: get r
i
d
of wast
e
ful find_origin()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
Junio C Ha
m
ano
git-pickaxe: do not
c
onfuse two
o
r
igins that
a
re the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
J
u
nio C
Ham
a
n
o
gi
t
-
p
ickaxe
:
do no
t
keep
commit buffer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
Ju
n
io
C Hamano
git-pickaxe: int
r
oduce heuristics to avoid "triv
i
al
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
J
u
n
i
o
C
Hamano
git-pick
a
xe: improve
"
b
est match" heuristics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
J
u
ni
o
C Hamano
git-
p
ickaxe: f
i
x nth_line
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-21
Juni
o
C
H
ama
n
o
git-pic
k
axe: pagenate output by defaul
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-20
Juni
o
C Hamano
Me
r
ge
b
ranch '
m
ain
t
'
commit
|
commitdiff
|
tree
2006-10-20
Junio C
H
aman
o
pager: default to LESS=FRS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-20
Junio C Ha
m
a
n
o
g
i
t-pickax
e
-
C
: blam
e
cut-a
n
d
-
past
e
d
l
ines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-20
J
unio C Ham
a
no
git-picka
x
e -M
:
b
lame l
i
n
e
movemen
t
s within a f
i
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-20
Ju
n
i
o
C Haman
o
gi
t
-pickaxe
:
b
l
ame r
e
w
ritt
e
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-20
Juni
o
C
Ham
a
no
M
er
g
e br
a
nch 'm
a
int
'
commit
|
commitdiff
|
tree
2006-10-19
Ju
n
io C Hamano
ref
-
log: fix D/F confli
c
t
c
o
ming from dele
t
ed refs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-19
Jun
i
o
C
Hamano
Merge branch 'mw/pa
t
hinfo'
commit
|
commitdiff
|
tree
2006-10-19
Junio C
H
a
m
ano
Merg
e
branc
h
'js/diff'
commit
|
commitdiff
|
tree
2006-10-19
J
u
nio C Ha
m
ano
Me
r
ge bra
n
ch 'jc/
s
end-email'
commit
|
commitdiff
|
tree
2006-10-19
Junio
C
Haman
o
Merge bra
n
ch 'jc/g
r
ep
'
commit
|
commitdiff
|
tree
2006-10-19
J
u
nio C Hamano
Merge ear
l
y part
o
f branch 'jc/diff-apply
-
patch'
commit
|
commitdiff
|
tree
2006-10-19
J
unio C Hamano
M
e
rge
b
ran
c
h 'jc
/
dif
f
-nums
t
at'
commit
|
commitdiff
|
tree
2006-10-19
Jun
i
o
C Ham
a
no
M
erge branch 'pb/bi
s
ect
'
commit
|
commitdiff
|
tree
2006-10-19
Junio C H
a
mano
Merge branch 'm
w
/send-email'
commit
|
commitdiff
|
tree
2006-10-19
Junio C Haman
o
Merge b
r
an
c
h
'rs/rebase'
commit
|
commitdiff
|
tree
2006-10-19
Junio C
Haman
o
Merge branch 'sb/fet
c
h'
commit
|
commitdiff
|
tree
2006-10-19
Juni
o
C Haman
o
M
erge bran
c
h 'sk/svn'
commit
|
commitdiff
|
tree
2006-10-19
Junio C Haman
o
M
e
rg
e
branch
'
rs
/
zip
'
commit
|
commitdiff
|
tree
2006-10-17
Junio C Ham
a
no
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-10-15
Jun
i
o
C Hamano
gitweb: u
s
e for-ea
c
h-
r
ef to
show the latest act
i
vity
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next