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
Split out merge_recursive() to merge-recursive.c
2008-08-31
Miklos
V
ajna
S
p
l
i
t
out merge_recursiv
e
()
to merge-recurs
i
v
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s Vajna
Makefile:
enable SNPRIN
T
F
_
RETUR
N
S_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix '
g
it he
l
p
h
elp
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
k
l
os Vajna
t9300: replace '!' with test_m
u
st_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajn
a
Documentation:
document th
e
pager
.
*
c
onfiguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
i
k
los Vajna
Builtin g
i
t-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
V
ajna
builtin
-
help: always load_com
m
a
nd_list() in cm
d
_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a second testcase for handli
n
g invalid strate
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
Vajna
Add a new
t
est for using a
cu
s
tom
m
e
r
ge st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
built
i
n-merge: allow usin
g
a
c
ustom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajn
a
builtin-he
l
p: make s
o
me internal funct
i
ons available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: ex
t
e
nd
t
h
e 'merge
picks up t
h
e best
r
e
s
ul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
Vajna
builtin-me
r
ge
:
g
i
ve a
p
r
o
per error mes
s
ag
e
fo
r
inval
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vaj
n
a
Teach
'
g
it mer
g
e' t
h
a
t
some merge strategies no lon
g
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
j
n
a
Add a new test for
g
it-m
e
rge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: ad
d
a new test for g
i
t-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
Vajna
m
ake remo
v
e-
d
ashes:
ap
p
ly to scripts and
p
r
o
grams a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
git-bi
s
e
ct: use dash-less form on
git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t1007-hash-ob
j
ect
.
sh:
u
se q
u
o
t
e
s for the test descript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t0001-init
.
sh: change confusing dire
c
tory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los
V
a
jna
B
u
ild
i
n m
e
rg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
F
ix
t
7601-mer
g
e-pull-config
.
sh on
A
I
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tre
e
:
make i
t
usable
fr
o
m other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
dd
new test
case t
o
ensure git-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to-git: use git
i
nit
i
nstea
d
o
f
git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jna
h
g-to-
g
i
t
:
r
ewrite
"git-frotz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
ik
l
os Vajna
hg-to-g
i
t: abort if the project dire
c
tory
i
s not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-g
i
t: a
v
oid raising a string exce
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
I
NSTALL: Update section about git
-
frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Reti
r
e 'st
u
pid'
m
erge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add
new test case
to ensure git-merge re
d
uces o
c
topus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
A
dd new te
s
t to
e
nsur
e
git-me
r
g
e
handl
e
s mo
r
e t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Vajna
Introduce get_oc
t
op
u
s_merge_base
s
() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
git-fmt-merge-msg: make it
u
sable fr
o
m other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
a
j
n
a
Move read_ca
c
he_unme
r
ged
(
) to
r
ead-cac
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Vaj
n
a
Add new te
s
t to ensure git-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve
parse-opti
o
ns
'
s skip_prefix() to git-compat-u
t
il
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los V
a
jna
Move
c
ommit_
l
ist_count() to c
o
m
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os Va
j
na
pat
h
-
l
i
st docume
n
ta
t
i
o
n:
d
o
cum
e
nt all functions an
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-
c
ommand documentation: fix "memset()" p
a
rame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
Vajna
gi
t
-read-tree: documen
t
-v
op
t
ion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los
V
a
jna
A simple
sc
r
ipt to parse th
e
results from
the
t
e
s
t
c
ases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase
-i: mention the short command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
R
emove
u
nus
e
d code in parse_co
m
mit_buffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Mi
k
los
Vajna
Strbuf docu
m
e
n
tation: d
o
cument most fu
n
ctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Vajna
Re
v
ision walking
d
ocumentation: doc
u
ment most imp
o
rtant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
l
o
s
V
a
j
na
CodingGuideline
s
: Add a no
t
e to
a
void
assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
i
k
los V
a
j
n
a
git-me
r
g
e
:
e
x
c
l
ude
u
nnecessary
option
s
fro
m
OPT
I
ONS_SPE
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
iklos
Vajna
git-fast-import:
rena
m
e
cmd_*()
fun
c
tions to p
a
rse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
i
klos Va
j
na
IN
S
TALL: add a note ab
o
ut GNU in
t
eractive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
a
jn
a
Ad
d
tests fo
r
sendemail
.
cc configurati
o
n variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-se
n
d
-
e
ma
i
l: add
a
n
e
w sendem
a
il
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s V
a
jna
g
i
t
-format
-
patch:
add a new f
o
rma
t
.
cc c
o
nfigura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajn
a
git chec
k
out
:
ad
d
-t alia
s
f
or --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
i
k
los
V
ajna
di
f
f opt
i
ons documentat
i
on:
refer to --diff-f
i
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
los
Vaj
n
a
contr
i
b/hooks
:
add an example pre
-
auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
Doc
u
mentation/ho
o
ks: add p
r
e-auto-
g
c hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
gi
t
-
g
c
--a
u
to: ad
d
pre-auto
-
gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
D
ocum
e
ntation/git-merge:
d
ocument s
u
btree
s
trategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
los
Vajna
git-g
u
i:
U
pdated Hungaria
n
tra
n
slation (
e
5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Vajna
Update Hungari
a
n translati
o
n
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
klos
Vajna
I
m
p
rove t602
9
t
o
check
the
r
eal "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
Vajna
D
o
cumentation/g
i
t
s
vn log:
add a note a
b
out timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos Vajna
Doc
u
ment
a
tion/git-filter-bra
n
ch: add a new msg-filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
los Vajna
git-clean: handle erro
r
s if removing fi
l
e
s fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
D
ocu
m
ent
a
tio
n
/git
-
s
t
ash:
d
o
cum
e
n
t opti
o
ns for g
i
t sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
a
jna
g
it clone
-
s
d
ocumentation:
force a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
i
k
los
V
a
jna
built
i
n-g
c
.
c: guard config parser from valu
e
=
N
ULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-par
s
e man
p
age: spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
git pull m
a
npage:
d
on't include -
n
from fetch-opt
i
ons
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s: doc
u
ment p
r
oblems with git
gc --p
r
u
ne
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
os Vajna
Include
r
e
v-list options in
g
i
t-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os
V
aj
n
a
ls-remote: a
d
d -t
a
nd -
h
optio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using
m
erg
e
su
b
tree H
o
w
-
To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajn
a
t
/
t7001: av
o
id unnecessary ER
E
when using g
r
ep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklo
s
V
a
jna
g
it-sh
-
s
etup: doc
u
m
e
nt g
i
t_editor()
a
nd g
e
t_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklo
s
Vajna
e
v
eryday: replace
'
prune
'
and 'repack' with
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Va
j
na
Update Hungarian translation
.
1
0
0% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Incl
u
d
e
d
i
ff options in th
e
git-log
m
anpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
g
i
t-send-email: a
d
d a new
s
end
e
mail
.
t
o configu
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klo
s
Vajna
gi
t
stash: docume
n
t app
l
y's --in
d
ex swit
c
h
commit
|
commitdiff
|
tree
2007-09-29
Mikl
o
s
Vajna
git-bundle: fix command
l
ine exampl
e
s
i
n
the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s Vajna
User Manual: ad
d
a chapter for
s
ubmodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
iklo
s
V
a
jna
Hungarian translation o
f
g
i
t-g
u
i
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajn
a
g
itweb: ne
w
cgi
pa
r
amete
r
: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: prefer git_get_p
r
oject_own
e
r
()
over get_file
_
owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
M
iklos Va
j
na
Do
c
u
ment -<
n
> for git-format-pat
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree