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
merge-recursive: introduce merge_options
2008-08-31
M
iklos Vajna
merge-recursiv
e
:
i
n
t
r
o
d
uce merge_op
t
ions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merge_recursi
v
e() to merge-recurs
i
ve
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s
Vajn
a
M
a
kefile: e
n
able SNPRINTF_RETURNS_BOGUS for HP-
U
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Mikl
o
s
V
ajna
Fix 'git he
l
p
hel
p
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajn
a
t9300: r
e
p
l
ace '!' with test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
Vajna
Documentation: documen
t
the
pager
.
* co
n
figuration setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mi
k
los V
a
jna
Built
i
n git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Va
j
na
bui
l
tin-help: al
w
ays loa
d
_comman
d
_list() in cm
d
_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a
s
e
cond t
e
stcase
for hand
l
ing in
v
alid s
t
rate
g
ies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajn
a
Add a
n
ew te
s
t
f
o
r
us
i
n
g
a
cust
o
m
merge
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
b
u
i
l
t
in-merge: allow using a
cust
o
m
s
tra
t
egy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
buil
t
in-help: make
s
ome internal functions
available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
los Vajn
a
t
7601:
exte
n
d
the 'merge picks up the bes
t
result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
los Vaj
n
a
builtin-merge: giv
e
a proper error message
f
or
invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
V
aj
n
a
Teach 'git merge' th
a
t some merge stra
t
egies n
o
longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
Ad
d
a new te
s
t for git-merg
e
-
r
esol
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
t6021:
a
dd a
n
ew test f
o
r git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
make remove-dashes: apply to scripts a
n
d programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
gi
t
-bisect: use
da
s
h-l
e
ss
form
o
n git
bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-
o
bject
.
sh:
use quotes for the
t
e
st description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
j
n
a
t0001
-
init
.
sh:
c
hange conf
u
sing dir
e
ctory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os
Vajna
Build in
m
e
r
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
Fix t7601-merge-pull-co
n
fig
.
sh
on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
l
o
s Vajna
git-c
o
mmit-tree: ma
k
e it usab
l
e from other
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new
t
est c
a
s
e
to ens
u
re
g
i
t
-merg
e
prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vaj
n
a
hg-to-git: u
s
e git init inste
a
d of
g
it init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
ikl
o
s Vajna
hg-to-git: rewrite "git-fr
o
t
z"
t
o "git
f
rotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajn
a
hg-to-
g
it: abort i
f
th
e
project
d
irec
t
o
r
y
is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
aj
n
a
hg-
t
o
-
git:
a
v
oi
d
r
a
ising a string exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
INSTALL: Update section a
b
out
g
it-
f
r
o
tz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Vajna
Retir
e
'st
u
pi
d
' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test ca
s
e t
o
ensure gi
t
-merge red
u
ce
s
octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add ne
w
test to
e
ns
u
re
git-merge handles mo
r
e th
a
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
I
n
troduce get_oct
o
p
u
s_me
r
g
e_bases()
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:
m
ake it
u
sable f
r
om other bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move read_cache_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 t
o
ensure git-merge handles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move pa
r
se-options's s
k
ip_p
r
e
f
ix() to g
i
t-c
o
mpat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
c
ommit_li
s
t_count() to
c
ommit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmdline() to alia
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list document
a
t
i
on: docume
n
t al
l
f
u
nctions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
ru
n
-command
d
ocument
a
tion:
f
ix
"
memse
t
()
"
para
m
eter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
aj
n
a
g
it-r
e
ad-tre
e
:
doc
u
me
n
t -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos
V
ajna
A simple scr
i
pt to parse the r
e
sults from
the testc
a
se
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-re
b
ase
-i:
menti
o
n the sho
r
t
c
omma
n
d
al
i
ase
s
i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
Remove unused code in parse_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf d
o
cument
a
t
i
on
:
document most functio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos V
a
jn
a
R
e
vision walking documen
t
a
t
i
on: document most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos V
a
jna
Codi
n
gGuidelin
e
s: Ad
d
a no
t
e to avoid assignme
n
ts ins
i
de
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos V
a
jna
gi
t
-m
e
rge: exclude unnecessary options from OPTION
S
_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajna
g
it-fas
t
-im
p
o
r
t:
renam
e
cmd_*() functions to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Va
j
na
I
N
STALL: add
a
no
t
e
a
b
o
ut GN
U
interacti
v
e
t
ools ha
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Ad
d
tests
f
o
r
sendemail
.
cc configur
a
tion
v
ariable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
git-send-email: add a
new se
n
d
em
a
i
l
.
cc co
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-fo
r
mat-patch: a
d
d a new format
.
cc configur
a
tion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Mikl
o
s Vajna
git checkout:
a
dd -t ali
a
s for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklo
s
V
ajna
diff
op
t
i
o
ns documentation: ref
e
r to --d
i
ff-filte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks: add an example p
r
e-auto-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
los Vajna
Documenta
t
ion/hooks: add pre-auto-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
git-gc
-
-
auto: add pre-
a
uto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos Vajna
D
o
cumentation/git-merge: document subtre
e
strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui
:
Updated H
u
ngarian transla
t
ion (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Va
j
na
Update Hungar
i
an tr
a
nsla
t
ion
.
100% compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
M
iklos Vajna
Improve t6
0
29
to check the real "s
u
b
t
r
ee" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Doc
u
me
n
tati
o
n/
g
it svn log: add a note
a
bout time
z
o
nes
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
Vajna
Doc
u
m
en
t
ation/gi
t
-
filter-branch:
a
d
d
a
new m
s
g-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
gi
t
-clean: h
a
ndle
e
rrors if removing file
s
fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
i
klo
s
Vajna
Doc
u
mentation/g
i
t-stash: document options for
g
it stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos V
a
jn
a
git clone -s
documentation: force a
n
ew
p
aragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klos
V
a
j
n
a
bu
i
ltin-gc
.
c: guard config p
a
rser from value=
N
U
LL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git r
e
v-
p
arse manpag
e
:
sp
e
llin
g
fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
M
iklos Vajn
a
git pu
l
l manpage
:
do
n
't include -n
f
rom
f
etch-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
:
document problem
s
with
g
it gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos
V
ajna
I
nclude rev-list o
p
tions in git-log ma
n
p
age
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
l
s-remote:
ad
d
-t and -h option
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
iklos Vajna
Add usi
n
g
m
erge subtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
M
i
klos Vajna
t
/
t7
0
01: avoid unnecessary ERE w
h
en using
grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
l
os
Vajna
git-sh
-
setup: docume
n
t g
i
t
_
editor()
a
nd
get_autho
r
_
ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mik
l
os Vajna
eve
r
y
day: repl
a
c
e 'prune' and 'r
e
pack' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Update Hungarian tran
s
lation
.
1
0
0% complete
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vajna
Inclu
d
e diff opti
o
n
s
in
the
g
it
-
l
o
g manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
iklos Vajna
git-send-email: a
d
d
a new
sende
m
ail
.
to
configura
t
i
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklo
s
V
ajna
git stas
h
: document apply'
s
--index sw
i
tch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bu
n
dle: fix
c
o
m
mand
l
ine examples in t
h
e
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Va
j
n
a
User Manual: add a
ch
a
pter
f
or submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
i
k
los V
a
jna
Hungarian tra
n
sl
a
ti
o
n of
g
it
-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos V
a
jna
g
itweb: new cgi par
a
m
ete
r
: o
p
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mikl
o
s Vajna
gitweb: p
r
efer git_get_project_owne
r
()
o
ver
g
e
t_f
i
le_ow
n
er()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Docume
n
t -<n> for g
i
t-format-
p
atch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree