repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: release the lockfile in try_merge_strategy()
2008-09-07
Miklos Vajna
builtin-m
e
rge: relea
s
e the
l
ockfile
i
n try_merge_strat
e
gy(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
aj
n
a
merge
-
recursive:
g
et r
i
d of virtual_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
me
r
ge-recursive: move current_
{
file
,
directo
r
y
}
_s
e
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: move the globa
l
obuf to
stru
c
t me
r
ge_option
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
rge-recursive: get rid of the index
_
only
glo
b
a
l variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
M
iklo
s
Vajna
m
e
rge-
r
ec
u
r
s
ive: m
o
ve call_depth to struct me
r
ge_opti
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
c
herry-p
i
ck/r
e
vert: ma
k
e
direct internal call t
o
me
r
g
e
_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin
-
m
e
rge: avoid run_command_v_opt() for
r
ecursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
merge-recursi
v
e: introduc
e
merge
_
o
pti
o
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out
merge_
r
ecursive()
t
o merge-r
e
c
u
rsive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos Vajn
a
Makefile: enable SNPRINTF
_
R
ETURNS_BOGUS for
HP
-
UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajn
a
Fix 'g
i
t help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
Vajn
a
t9300: rep
l
ace '!' with test
_
mus
t
_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los Vajna
Doc
u
mentati
o
n: doc
u
ment the pager
.
* confi
g
uration sett
i
ng
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklo
s
V
ajn
a
Builtin git-
h
e
l
p
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Vajna
builtin-hel
p
:
always load_command_lis
t
() in cmd_hel
p
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vaj
n
a
Add
a
second
te
s
tcase fo
r
handling invalid strate
g
i
es
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a
new
t
est fo
r
u
s
i
n
g a cust
o
m merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-merg
e
: allow using a custom
strate
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builti
n
-
help
:
make
s
o
m
e inter
n
al function
s
availab
l
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
i
kl
o
s Vajna
t7601: extend the 'merge picks up
t
he best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
builtin
-
merge:
g
ive
a proper e
r
ror message for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos V
a
jna
Teac
h
'git merge' that
s
ome me
r
ge
s
trategi
e
s no l
o
nger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
Add a new test for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6021: add a new
t
est for git-merge-res
o
lve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los V
a
jna
m
a
ke remove-da
s
hes: apply to s
c
ripts a
n
d
programs
a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
i
t-
b
isect: use dash-les
s
form on git bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t100
7
-hash-objec
t
.
s
h
:
use quotes fo
r
the t
e
st descrip
t
ion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vaj
n
a
t0001-init
.
sh
:
c
h
a
nge con
f
usin
g
directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos Vajna
Build
i
n merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
a
j
na
Fi
x
t7
6
01
-
merge-pull-c
o
nfi
g
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
j
na
git-
c
ommit-tree: make it usa
b
le fro
m
other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add new test
ca
s
e to ensure git-me
r
ge
pr
e
pends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
lo
s
Vajn
a
h
g-to-
g
it: u
s
e git init instead
o
f git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
h
g
-
t
o-
g
it: rewrite "gi
t
-f
r
otz" to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
h
g
-to-git:
a
bort if the pr
o
j
e
ct
directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git
:
avoid ra
i
sing a string exc
e
ptio
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL
:
Update sec
t
i
o
n about git
-
frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklo
s
Vajna
Retire 's
t
up
i
d' merge strateg
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new test ca
s
e
t
o
ens
u
re gi
t
-
merge reduces o
c
top
u
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
A
dd n
e
w tes
t
to ensure git-merge handles
m
ore th
a
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
Intro
d
uce
g
et_octopus_m
e
rge_bases(
)
in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-me
r
ge-msg: make it
u
sable from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Mov
e
r
e
ad_cache_unmerged() to
r
ea
d
-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Vajna
Add
n
e
w tes
t
to ensure git-merge han
d
les pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
a
jna
M
ove parse-options's ski
p
_p
r
efix
(
)
to git-compat-
u
til
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cm
d
line() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos
V
ajna
path-l
i
st documen
t
ation: documen
t
al
l
fun
c
tions an
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Vaj
n
a
run-
c
om
m
and documentation: fix
"
memset(
)
" p
a
rameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-
r
e
ad-t
r
ee: docume
n
t -v
o
ption
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
A
s
impl
e
s
c
ript to parse
t
he r
e
sul
t
s
from the test
c
ases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase -i: mention th
e
sh
o
rt command
a
liases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
Remove u
n
used code in parse
_
commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf do
c
umentation: do
c
ument
most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Re
v
ision
w
alking
docume
n
ta
t
i
on:
d
ocument most im
p
ort
a
nt
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
V
aj
n
a
Cod
i
ngGuidelines: Add a
note to avoi
d
a
ssignments insid
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge: exc
l
ude unn
e
c
essary options from OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s V
a
j
na
gi
t
-
fast-im
p
ort: rename cmd_*() functions to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
IN
S
TALL: add a
n
ote abo
u
t GNU interactive
t
oo
l
s
has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests f
o
r
se
n
dem
a
i
l
.
c
c configuration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Va
j
na
g
i
t-send
-
e
ma
i
l: add
a new sende
m
ail
.
cc confi
g
uration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
git-f
o
rmat-p
a
tch: ad
d
a new
f
ormat
.
cc
con
f
igur
a
tion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Va
j
na
git che
c
k
out: add -t alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff opt
i
o
n
s docu
m
e
nt
a
tion: re
f
er to --di
f
f
-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks: add a
n
example pr
e
-
auto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os V
a
jna
Documentation
/
hook
s
: add
pr
e
-a
u
to-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
g
it-gc
-
-auto: a
d
d
p
r
e-auto-
g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/git-merge: document
s
u
b
tree s
t
rategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui
:
Up
d
ated Hung
a
rian
t
ranslation
(e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
o
s
Vajna
Update
H
ungarian translation
.
100%
comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t6029 to c
h
ec
k
t
he
r
eal
"subtree"
c
as
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Docu
m
en
t
ation
/
git s
v
n log:
a
dd a n
o
te about ti
m
ezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
V
ajna
D
o
cumentation/git-filter-b
r
an
c
h: add a ne
w
m
s
g-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
M
iklos Vajna
g
it-clean: handle
e
r
rors if removing
files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vajn
a
Documenta
t
ion/git
-
stash: document options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
ikl
o
s
Vaj
n
a
git cl
o
ne -
s
documentat
i
on: force a new paragraph
f
o
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos V
a
jna
builtin-gc
.
c: guard config
p
a
rser from value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-par
s
e manpage: spel
l
ing fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Mikl
o
s Vajna
git pull manpage: don
'
t i
n
clude -n from fetch-options
.
tx
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s:
document prob
l
ems with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
In
c
l
u
de rev-l
i
st
o
ptions in git-log
manpa
g
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: add -t and -
h
options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
i
klos Vajna
Add
u
s
i
ng mer
g
e
su
b
tree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
os Vajna
t/t7001: avoid un
n
ecessary
E
RE when using gre
p
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Mikl
o
s Vajna
g
it-sh-setup:
d
ocument
g
it_ed
i
tor() and
get_author_ident_f
r
o
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
los Vajna
everyday
:
replace 'prune' and 'repack
'
w
ith 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Upda
t
e
Hung
a
r
i
an transl
a
tion
.
100% co
m
p
l
eted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos V
a
jna
Include diff optio
n
s in the gi
t
-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos Vajn
a
g
i
t-se
n
d-email: add
a
new sen
d
e
m
ail
.
to conf
i
g
u
r
ation
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
gi
t
stash: document apply's -
-
i
ndex
s
witch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vaj
n
a
git-bund
l
e
:
f
i
x com
m
a
n
dline ex
a
mp
l
es in th
e
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Manual:
add a chapter for s
u
bmodule
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mik
l
os Va
j
na
Hungarian t
r
a
n
s
l
a
tion of git-g
u
i
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vaj
n
a
gitweb
:
n
e
w
cgi parameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos V
a
j
na
gitweb: pr
e
fer git_get
_
pro
j
ect_owner() over get_file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
i
klos Vajna
D
ocument -<n> for git-
f
orm
a
t-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree