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
builtin-merge: give a proper error message for invalid strategies in config
2008-07-22
Mi
k
los Vajna
builtin
-
m
e
r
ge: g
i
ve
a
proper error messa
g
e for i
n
valid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git
m
erge' that so
m
e merge stra
t
egies no longe
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los
V
ajna
Add a new test for
g
i
t
-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Va
j
na
t6021: a
d
d a
new test
f
or g
i
t-mer
g
e-reso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os V
a
jna
make remove-dashes: apply t
o
scri
p
ts
a
nd p
r
ograms
a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
gi
t
-bisect: use dash-less
form on git bise
c
t l
o
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t1
0
07-hash
-
object
.
sh: use quotes for the test descri
p
tion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s Vajna
t0001-init
.
sh: cha
n
ge confusing direct
o
r
y
n
ame
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix
t7601-merge-
p
ull-c
o
nfig
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
o
s
V
a
jna
gi
t
-commi
t
-
t
ree:
make it
usable from other bu
i
ltin
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
a
j
n
a
Add
ne
w
test c
a
se to
ensure git
-
merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-
t
o-git: use gi
t
init instead
of git in
i
t-d
b
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Va
j
na
hg
-
to
-
g
it:
r
ewrite
"
gi
t
-frotz"
to
"
git
frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-t
o
-git: abort if the
p
roject directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to
-
git: avoid raising a string exceptio
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
I
NST
A
LL: Upd
a
te section about
gi
t
-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Ret
i
re 'stupid' m
e
rge
s
t
rategy
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add new test ca
s
e to
ensu
r
e git-merge reduces o
c
topus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
A
d
d new test to
ensure git-me
r
g
e handles more t
h
an
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Introduce get_
o
cto
p
us
_
merge_bas
e
s(
)
in com
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
gi
t
-fm
t
-merge-msg:
m
ake
i
t usable from other built
i
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove read_cac
h
e
_
unmerged() to read-cach
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to ensure git-merge handles pu
l
l
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
M
ov
e
parse-op
t
ions's ski
p
_pref
i
x() to g
i
t-c
o
m
p
a
t-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_li
s
t_c
o
unt()
t
o commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vaj
n
a
M
ove split_cmdline()
to
a
l
ias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
p
a
th-list
d
ocumenta
t
ion: do
c
ume
n
t all functio
n
s and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos V
a
jn
a
run-comm
a
nd documentat
i
on: f
i
x
"mem
s
et
(
)"
parame
t
er
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
git-re
a
d
-
tree: docume
n
t -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
j
na
A simple scri
p
t
to
pars
e
the results from the te
s
tcas
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
git-rebase
-i:
m
ention the short co
m
m
and aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Rem
o
ve
u
n
u
s
e
d
c
ode in parse_comm
i
t_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
ajna
St
r
buf document
a
tion
:
d
o
cument most
f
unct
i
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
i
klos V
a
jna
Revision walking
d
ocumenta
t
ion: document most import
a
nt
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Vajna
Cod
i
ngGu
i
de
l
i
nes: Add a note t
o
avoid assignments
ins
i
d
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
M
ik
l
os Vajna
git-merg
e
: exc
l
ude unnecessary options fr
o
m OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajn
a
git-fast-i
m
port:
r
en
a
me cmd_
*
() functions to pars
e
_*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mikl
o
s Vaj
n
a
I
N
STALL:
a
dd a note abou
t
G
N
U
interactive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add t
e
sts for sendemail
.
cc
conf
i
gur
a
tion variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
l
os Vajn
a
git-send-emai
l
:
add
a ne
w
sendema
i
l
.
cc configuratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
i
t-format-patch:
a
dd a
n
ew format
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vaj
n
a
git checko
u
t:
a
dd -
t
alias for
-
-tra
c
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Va
j
n
a
diff
o
ptions documen
t
ation: refer
t
o
-
-diff
-
filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks: add an exam
p
le pre
-
auto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
Documentation/hoo
k
s: a
d
d
pre
-
auto
-
g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
git-gc --auto:
add
p
re-auto
-
gc ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Va
j
na
Docu
m
entation/git
-
merg
e
: docume
n
t
s
u
btr
e
e
strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Vajna
g
i
t-gui: Updated Hung
a
rian tr
a
n
slation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update
Hungarian tr
a
nsl
a
tion
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Imp
r
ove
t6
0
29 to
c
he
c
k the real
"
su
b
tree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklo
s
Vajna
Documentation/git svn log:
add a
n
ot
e
about ti
m
ezon
e
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos Vajn
a
Docu
m
entation/git-filter-branc
h
: add a n
e
w
msg-
f
ilter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos V
a
jna
gi
t
-cle
a
n
:
h
a
ndle errors i
f
r
e
moving files
f
ails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Mik
l
o
s
Vajna
Documentation/g
i
t-stash: docume
n
t options f
o
r git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mik
l
os Vajn
a
git clone -s d
o
cumentation:
force a n
e
w paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Va
j
na
builtin-
g
c
.
c:
gua
r
d config p
a
rse
r
from value=NUL
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mikl
o
s Vajna
g
i
t
re
v
-parse ma
n
pag
e
: spelling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklo
s
Vajna
gi
t
p
ull manpage: don't include -
n
from fetch
-
options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Mik
l
os Vaj
n
a
git-clone
-
s:
d
ocu
m
e
nt problems with git
g
c --p
r
u
ne
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
I
nclude rev-
l
ist options i
n
git-
l
og manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
l
s
-remote
:
add -t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using m
e
rge subtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
M
i
k
l
os
V
ajna
t/t7001: av
o
id unneces
s
ary ERE when using g
r
ep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
g
i
t-sh-se
t
up: document
g
it_editor() and
get_author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
every
d
a
y
: repl
a
ce 'pr
u
ne' and 'repack' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian trans
l
ation
.
100% complete
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
k
l
os Vajna
Include diff
options in the g
i
t
-log manpag
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklo
s
Vajn
a
git-send-email: add a new
sendemail
.
to
c
on
f
igura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajn
a
git
s
t
ash: document app
l
y
's -
-
ind
e
x
swit
c
h
commit
|
commitdiff
|
tree
2007-09-29
M
iklos Vajna
git-bundle
:
fix comman
d
l
i
ne ex
a
mples in the manp
a
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
s
e
r
M
a
nual: add
a
c
ha
p
ter for
su
b
mod
u
les
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
Vajna
Hung
a
rian translation
of g
i
t-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
git
w
eb: n
e
w c
g
i p
a
rameter:
opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gi
t
web: p
r
efer gi
t
_get_project_owne
r
()
o
v
er get_file_
o
wner
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
i
klos Vajna
Document -<n> for git-
f
or
m
at-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree