repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a new test for using a custom merge strategy
2008-07-30
Miklos
V
ajn
a
Add a ne
w
test for using a cust
o
m mer
g
e
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
builtin-merge
:
allow
using
a
c
u
stom str
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
builtin-hel
p
:
make som
e
internal functions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Va
j
n
a
t760
1
:
ext
e
nd the 'me
r
ge picks
up th
e
best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Mik
l
o
s Vajna
builtin-m
e
rg
e
: giv
e
a p
r
o
per
e
rror messag
e
for inval
i
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
i
kl
o
s Va
j
na
Teac
h
'git merge' that so
m
e merge strategi
e
s no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
Add a new test f
o
r
git-merge
-
r
esolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021
:
add a new test for
g
it-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make rem
o
v
e
-dashes: apply to script
s
an
d
pro
g
rams as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
git-bisect:
u
se dash
-
less form on g
i
t bis
e
ct log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t1007-hash-object
.
s
h: use quotes for t
h
e test descriptio
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
t
0
0
01-ini
t
.
sh:
change confu
s
ing directory nam
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los Vajna
Build
in
m
e
rg
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Fix
t
7601-merge-pull-conf
i
g
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-c
o
mmit-tree:
m
a
ke i
t
u
s
able fr
o
m o
t
her b
u
iltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add n
e
w
te
s
t
case to e
n
sure git
-
merge prepends
t
he
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajn
a
hg-to-git:
u
se g
i
t init
ins
t
ead of gi
t
init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-to-git: rewrite "
g
it-fr
o
tz" to "git f
r
o
t
z"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-g
i
t: ab
o
rt if th
e
pr
o
ject directory
i
s
not
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: a
v
oid raisin
g
a st
r
in
g
exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos V
a
jna
I
NSTA
L
L: Update section about git-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Va
j
n
a
Retir
e
'st
u
pid' merg
e
strate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add
n
ew t
e
st
ca
s
e
to
e
ns
u
r
e git-merge reduc
e
s octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
jna
Add new test to en
s
ure git-
m
erge
h
andles more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
a
jna
Introduce get_octopus_merg
e
_b
a
ses()
in co
m
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
g
i
t-
f
mt
-
me
r
ge-m
s
g: make
it
usable from other builtin
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
Mov
e
read_c
a
che_unmer
g
ed() to re
a
d
-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Ad
d
new test to
e
nsure
git-mer
g
e hand
l
es p
u
ll
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move
parse
-
o
pt
i
ons's skip_pr
e
fix() t
o
g
it-compa
t
-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
Vajna
Move commit_l
i
st_cou
n
t()
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
_cmdl
i
ne() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
path
-
list document
a
t
ion: document
all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajn
a
run-command documen
t
at
i
on: fix
"
m
e
mset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos
V
ajna
git
-
read-tree: d
o
c
u
m
ent
-
v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple scri
p
t to parse the resul
t
s
from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os
V
ajna
g
i
t-rebase -i: mention
t
he short command alia
s
e
s
in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klo
s
Vajna
Remove
u
n
used c
o
de in
p
arse_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos V
a
jna
Strbuf
docum
e
ntation: document mos
t
functi
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision wa
l
king documentatio
n
:
d
o
c
ument most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
C
o
dingGuid
e
lines: Ad
d
a note t
o
avoi
d
assignments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los Vajna
git-merg
e
: exclude unnece
s
sary options from OPTION
S
_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajna
git-fast-
i
m
p
ort: rename
c
md_*
(
)
f
u
nction
s
to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
M
i
klos Vajna
INSTALL: add
a note
about GNU
i
nteractive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add
t
e
s
ts for se
n
demail
.
c
c
conf
i
g
uration vari
a
ble
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los V
a
jn
a
git
-
send-emai
l
: add a new sen
d
emai
l
.
cc con
f
igura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
g
i
t
-format
-
p
a
tch
:
add a new format
.
cc c
o
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
M
ik
l
os Va
j
n
a
g
i
t checko
u
t:
add -
t
a
lias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
i
ff
opti
o
ns documentat
i
o
n
:
r
ef
e
r to -
-
diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
lo
s
Vajna
contrib
/
hoo
k
s: add an e
x
ample pre-auto-gc ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
los Vajna
Do
c
ument
a
tion/hook
s
:
add
p
re-auto
-
gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc
--aut
o
: add pre-
a
uto-gc h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s Vajna
Document
a
tion/git-merge: document s
u
btree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
it-gui: Updat
e
d Hun
g
arian translation (e5fba
1
8
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
iklos Vajna
Updat
e
Hungarian trans
l
a
t
ion
.
100% com
p
leted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos V
a
jna
Im
p
rove t6029 to check the real "subtree" cas
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
V
ajna
D
o
cumentatio
n
/g
i
t
svn log:
a
dd a note
a
bout timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documentati
o
n/git-f
i
lter-bra
n
c
h: add a new
m
sg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos
V
ajna
git-clean: ha
n
dle errors if remo
v
i
ng file
s
fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
D
o
cumentat
i
on/gi
t
-sta
s
h: document options for
git s
t
as
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vaj
n
a
git clon
e
-s doc
u
me
n
tation:
force a new paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
b
uiltin-gc
.
c: guar
d
co
n
f
ig par
s
er from value=NUL
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git
r
ev
-
p
a
rs
e
manpage: spe
l
l
i
ng fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vaj
n
a
g
i
t pull manpage: d
o
n't
i
nclude -n from fe
t
ch-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Mi
k
los Vajna
git-cl
o
ne -s: doc
u
ment problems
w
ith git
gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
V
a
j
n
a
Inc
l
ude rev-li
s
t options i
n
git-
l
o
g
manpa
g
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
ls-remote: add -t and
-
h optio
n
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using merge subtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
M
i
klos Vajna
t
/t7001: avoid unnecessar
y
E
R
E when using gre
p
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Mikl
o
s V
a
j
n
a
git-sh-set
u
p:
d
o
cu
m
en
t
git
_
editor() and get
_
author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
l
os Vajna
everyday: replace 'pru
n
e' and
'repac
k
' with 'g
c
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Update Hungarian translat
i
on
.
100% compl
e
ted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
k
los
Vajn
a
Includ
e
d
iff
opti
o
ns in the git-
l
og manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Mi
k
l
os Vajna
g
it-send-email: add a
new sendemail
.
to configu
r
ation
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklo
s
Vajna
g
i
t stash:
d
ocument ap
p
l
y's --inde
x
s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
M
i
k
los Vaj
n
a
g
i
t
-bundle:
fix
commandline examples in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vaj
n
a
User Manual: ad
d
a
chapter
f
o
r
s
u
bmodule
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mikl
o
s V
a
jna
H
u
ngarian translatio
n
of git
-
gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajn
a
g
itweb: ne
w
c
g
i parameter:
o
p
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gi
t
w
eb: prefer git_get_
p
r
oject_owner() over get_file
_
owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
iklos Va
j
na
Document -<n>
f
o
r git-forma
t
-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree