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
cherry-pick/revert: make direct internal call to merge_tree()
2008-09-03
Mik
l
os
V
ajna
cherry-p
i
ck/revert: make direct inter
n
al call to merge_tre
e
()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
buil
t
in
-
me
r
ge:
avo
i
d
run_command_v_opt() for recursiv
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los V
a
jna
merge-
r
ecursive: introd
u
ce merge_op
t
i
o
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos V
a
jna
S
p
l
i
t
out mer
g
e_recursive() to
merg
e
-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos V
a
j
n
a
M
a
kefile: enable SNPRINTF_RETURNS_BO
G
US for H
P
-U
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vajna
Fix 'git help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
Vajna
t930
0
: replace
'!' with test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documenta
t
ion: d
o
cu
m
ent the pager
.
*
c
onfigura
t
ion setti
n
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builti
n
git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Va
j
n
a
b
u
iltin-hel
p
: alwa
y
s load_comman
d
_list()
in cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
l
os Vajna
Add
a
s
e
c
o
nd t
e
s
t
case f
o
r handling in
v
alid
s
trategie
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test for us
i
ng a cust
o
m
merge
s
trategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
Vajna
bu
i
lti
n
-merge
:
al
l
ow u
s
ing a custo
m
st
r
ategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
bui
l
tin-he
l
p: make some int
e
rnal fun
c
tions avail
a
ble
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
o
s Vajna
t
7601
:
extend the '
m
erge
pick
s
up
t
he best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vaj
n
a
builtin-me
r
ge: give a proper error
mess
a
ge for invali
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
l
os Vajna
Teach '
g
it
m
e
r
g
e
'
t
hat some merge strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
A
d
d a new test for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t602
1
:
add a new
test
for
git-merge-re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os V
a
jna
make rem
o
ve-d
a
shes:
a
pply t
o
scripts an
d
p
rograms a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
g
i
t-bisect:
use dash-
l
ess form o
n
git bis
e
ct log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t10
0
7-h
a
sh-object
.
s
h
: us
e
quot
e
s for
t
he
test description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
os Vaj
n
a
t0001-init
.
s
h
: change c
o
nf
u
sing d
i
rectory na
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajna
B
u
ild
i
n
m
erge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix
t7
6
01-me
r
ge-pull-config
.
s
h o
n
AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
i
t-commit-tree:
m
a
ke it usable from other
b
uiltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajn
a
Add new test c
a
se to ens
u
re git-merge prepe
n
ds the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos V
a
jna
hg-t
o
-g
i
t:
u
se
g
it init in
s
t
ead of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
Vajna
h
g
-to-git: re
w
rite "git-
f
rotz" to "git fro
t
z
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to
-
git: abort if the project
dire
c
to
r
y i
s
not
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-
t
o-git
:
avoid raisi
n
g a st
r
ing
e
xc
e
ption
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
INSTA
L
L
: Update
s
ection ab
o
ut g
i
t
-
fr
o
tz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vaj
n
a
Retire
'
s
t
upid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Add new test
c
ase
t
o ensure git-merge r
e
d
uces
octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Add new test to e
n
sure git-me
r
ge handles mor
e
than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Introd
u
ce
get
_
oc
t
opus_
m
e
r
g
e_b
a
ses()
i
n comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
V
a
jna
g
i
t
-
f
m
t-
m
erge-msg: mak
e
it usable from
other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
Vajn
a
Move read_cache_unmerged() to
r
ead-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new
t
e
st
to ensure git-merge hand
l
e
s pu
l
l
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve
p
ar
s
e-option
s
's skip_prefix() to git-comp
a
t-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move comm
i
t_list_c
o
unt(
)
to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los
V
ajna
Move sp
l
i
t
_
c
m
dl
i
ne() t
o
alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
a
th-list documentation
:
document
a
ll f
u
nctions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-co
m
mand
doc
u
ment
a
tion: fix "memset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
g
i
t-read-
t
ree:
d
oc
u
me
n
t -
v
option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
A sim
p
l
e
script to parse the
res
u
lts from t
h
e testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
git-r
e
base -i: mention
th
e
short command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
Re
m
ove
u
nused code
i
n
parse
_
c
ommit_buffe
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
trbu
f
d
ocument
a
tion: docu
m
ent
m
ost
f
u
nc
t
i
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos
V
ajn
a
Revisio
n
walkin
g
documentation: docum
e
nt
m
ost important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingGui
d
el
i
ne
s
: Add a note to av
o
id assignments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
Vajna
git
-
merge: exclude unnec
e
ssar
y
options fro
m
OP
T
IONS_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vaj
n
a
g
it-fa
s
t-imp
o
rt: renam
e
cmd
_
*
(
) func
t
ions to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
M
iklos
Vajna
INSTALL: ad
d
a note
a
bout GNU interactive tools
has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests for sendemail
.
cc confi
g
uration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Va
j
na
git-s
e
n
d
-
e
m
a
il: a
d
d a new sendemail
.
c
c
conf
i
guration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vajn
a
git-form
a
t
-patch:
add a new fo
r
mat
.
cc confi
g
u
r
ation
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos V
a
jna
git checkout: add -
t
alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff
options do
c
umentation: r
e
fer to --di
f
f-filte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
l
o
s
Vajn
a
contrib/ho
o
ks
:
add an example pre-
a
u
to-gc
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentati
o
n/hooks: ad
d
p
re-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-g
c
--
a
uto: ad
d
pre-a
u
to-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vaj
n
a
Document
a
tion/git-mer
g
e
: document subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Va
j
n
a
git-gui: Updated Hunga
r
ian trans
l
ation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
i
kl
o
s Vajna
U
p
da
t
e
Hungarian trans
l
ation
.
100
%
complet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
m
p
rove t602
9
to c
h
eck the real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
D
oc
u
mentati
o
n/git sv
n
log: add
a
n
o
t
e
a
bout t
i
me
z
ones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vaj
n
a
Documentation/gi
t
-filter-branch:
add a new msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
g
it-clea
n
: handle
er
r
o
r
s
if remo
v
i
n
g files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
aj
n
a
Documentation/git-s
t
ash: d
o
cument options for
g
it stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vajn
a
git c
l
one
-
s docume
n
tation: forc
e
a new paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-gc
.
c: g
u
ard config parser f
r
o
m
valu
e
=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mi
k
los V
a
jna
git rev-
p
arse ma
n
page: spelli
n
g
f
ix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
M
i
k
lo
s
Vajna
git p
u
ll manpage: don'
t
include -n from
f
et
c
h-options
.
t
x
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Mi
k
los Vajna
git-clone -s: docu
m
en
t
problems w
i
th git gc --prun
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Include rev-l
i
st opt
i
ons i
n
git-log
manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklo
s
Va
j
n
a
ls-remote: add -t
and -h o
p
tions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Mikl
o
s Vajna
Add using mer
g
e subtr
e
e How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t
/t70
0
1: av
o
id unnece
s
sary ER
E
when using gre
p
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
los Vajn
a
git-sh-setup
:
doc
u
ment git_editor() and get_author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday:
r
eplace '
p
ru
n
e' and 'repack'
wi
t
h 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Upd
a
te Hun
g
arian
transla
t
ion
.
1
00% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include diff
o
ptions
in the g
i
t
-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklo
s
Vajna
git-send-
e
m
a
il:
add a new sendemail
.
to
c
on
f
i
g
ura
t
i
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
i
kl
o
s Vajna
git stash:
docum
e
n
t
apply's --index swit
c
h
commit
|
commitdiff
|
tree
2007-09-29
M
iklos Vajna
gi
t
-
b
u
ndle: fix comman
d
l
i
ne examples in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mi
k
los Vaj
n
a
Us
e
r Manual
:
add a chap
t
er for submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mik
l
os V
a
jna
Hungarian translati
o
n of
g
it-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
g
i
tweb: new cgi
p
arameter: o
p
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
l
o
s Vajna
gitweb: prefer g
i
t
_
get_project_owner() over
g
et_file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
iklo
s
Vajna
Docu
m
ent -<n> f
o
r
git-form
a
t-patc
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree