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
Remove empty directories in recursive merge
2008-09-10
M
iklos Vajna
t7501: alw
a
ys us
e
t
est_cm
p
i
nstead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
Makefi
l
e:
add merge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
a
kefile: ena
b
l
e
SNPRINTF_
R
ETURNS_BOGUS
for HP
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git h
e
lp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t
9
30
0
:
repl
a
c
e
'!' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
V
a
jna
Docu
m
e
n
tati
o
n: docum
e
nt the page
r
.
* conf
i
guration s
e
tting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklo
s
Vajna
t7
6
01: e
x
tend the 'merge pi
c
ks up
t
he best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mik
l
os Vajna
builti
n
-
merge: give a p
r
oper error mess
a
ge for
i
nval
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s
Vajna
Teach 'gi
t
m
e
rge' that
s
ome merge
s
trategies n
o
l
onge
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
l
o
s V
a
j
n
a
Add a new test f
o
r git-me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos
Vajna
t
6
021
:
add a new test for git-merge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
m
ake remove-dashes: apply to scripts
a
nd p
r
ograms
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
git-b
i
sect: use dash-less form
o
n
git
b
isect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
t1007-hash-obje
c
t
.
sh: u
s
e quo
t
e
s
f
o
r
the test
d
escription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t0001-init
.
sh: chan
g
e confu
s
i
ng directo
r
y
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
iklo
s
Vajn
a
Build in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-merge-pull-
c
on
f
ig
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tre
e
: ma
k
e it usab
l
e
from other bui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajn
a
Add n
e
w test case to ensure git-me
r
g
e prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s Vajna
h
g-to-g
i
t: use git init
i
nst
e
ad of git in
i
t-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
ik
l
os Vajna
hg-to-git:
rewr
i
te "git-frotz"
to "
g
it frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git:
abort i
f
the projec
t
directory is n
o
t a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-
t
o-
g
it: avoid
ra
i
sing
a
stri
n
g
excepti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
I
NS
T
AL
L
: Update section abo
u
t git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajn
a
Retire 'stupid' m
e
rge st
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
A
dd new test
case to ensure git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Va
j
na
Add n
e
w
t
est t
o
en
s
ure git-merge
h
andles more
t
ha
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Introdu
c
e get_octo
p
us_merge_bas
e
s(
)
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
git-fmt-m
e
rge-
m
sg: make i
t
usable fro
m
other bui
l
tin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move read_cache_unmerged() to
r
ead-c
a
che
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add n
e
w
test
t
o ensure git-m
e
r
g
e handles
p
ull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move parse
-
optio
n
s's skip_prefix() to git-c
o
m
p
at-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commi
t
_li
s
t_count()
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos V
a
jn
a
Move
split_cmdl
i
ne() to
a
l
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
na
path-
l
i
s
t
docume
n
t
a
tion: d
o
cument all
f
unctions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
iklo
s
Vajna
ru
n
-comm
a
n
d
doc
u
mentation: fix "memset()" parame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los Vajna
g
i
t-read-t
r
ee: docu
m
ent -v o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
A
sim
p
le scr
i
pt to par
s
e the results from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-reba
s
e -i:
m
e
ntion the short command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
Remove u
n
used code in p
a
rse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vaj
n
a
Strbuf
d
ocumentation:
document most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Re
v
is
i
on walking documenta
t
io
n
:
d
oc
u
ment m
o
st imp
o
rtant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Codi
n
gGui
d
elines: Add a no
t
e
to avoid assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
os Vajna
git-m
e
rge: ex
c
lude unneces
s
ar
y
optio
n
s from OP
T
IONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
klos Vajna
git-fas
t
-import
:
r
ename cmd_*(
)
fu
n
ct
i
ons t
o
parse_
*
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
os
Vaj
n
a
INSTA
L
L: add
a note about
G
NU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Va
j
na
Add test
s
fo
r
se
n
dema
i
l
.
cc configuration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
git-send-e
m
a
il: add
a
new se
n
d
e
mail
.
cc c
o
nfigurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
git-for
m
at-patch: add a new format
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklo
s
Vajna
git checkout: add
-
t alias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
i
f
f
o
pt
i
o
ns
docum
e
nt
a
tion: refer to
-
-diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s V
a
jna
c
o
n
t
rib/hooks: add an
e
x
ample pr
e
-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Do
c
umentation/hoo
k
s: add pre-au
t
o-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Va
j
na
git-gc
-
-
auto: add
pre-a
u
t
o
-
g
c
h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/git-mer
g
e: document subtr
e
e stra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
iklos Vajna
git-gui: Updated Hungarian
t
r
anslation (e
5
fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Vajna
Update Hungarian translatio
n
.
10
0
% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mikl
o
s Vajna
Improve t602
9
t
o ch
e
c
k
t
h
e real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
klos
Vaj
n
a
Docum
e
n
t
ati
o
n/
g
it
s
vn log: ad
d
a note
a
bout
ti
m
ezon
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mik
l
os Vaj
n
a
Doc
u
m
entation
/
g
it
-
filter-branch: ad
d
a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Va
j
n
a
git-cle
a
n: h
a
ndle er
r
ors if re
m
oving files f
a
ils
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
ik
l
os
V
a
jna
Documen
t
ation/git-
s
ta
s
h
:
document opti
o
ns fo
r
git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s d
o
cume
n
tation:
force a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klos Vajna
buil
t
in-gc
.
c: g
u
ard co
n
fig parser fro
m
value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
i
kl
o
s
Vajna
git rev-parse ma
n
p
age: spelli
n
g f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vaj
n
a
git pull ma
n
page: don't
i
ncl
u
de -n fr
o
m fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s:
do
c
ument problems with git gc --prun
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
os
V
a
jna
I
nclude re
v
-lis
t
options i
n
git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
remote: add
-
t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos
V
a
j
na
Add using merge subtree H
o
w-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
Vajna
t/t700
1
: avoid unneces
s
ary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mikl
o
s Vajna
gi
t
-sh-se
t
up:
d
o
cu
m
ent g
i
t_edi
t
or()
a
nd get_autho
r
_ident_f
r
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vajna
everyday: replace 'prun
e
'
a
n
d
'repack' w
i
th 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Va
j
na
Upd
a
t
e H
u
n
gari
a
n translati
o
n
.
1
00
%
com
p
leted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
iklos V
a
jna
Inc
l
u
d
e
d
i
ff options in
t
h
e
gi
t
-log ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos
V
ajna
git-send-email:
add a new sendema
i
l
.
to configu
r
ati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
iklos Va
j
na
gi
t
stash: docu
m
ent apply
'
s -
-
index switc
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
gi
t
-bundle
:
fix comma
n
dline
exampl
e
s in the m
a
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
k
los Vajna
User Ma
n
u
a
l:
a
dd a c
h
apte
r
f
o
r submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vaj
n
a
Hungarian translation of git-gu
i
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os V
a
j
n
a
gitweb: new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
M
i
klos Va
j
na
g
i
tweb: prefer git_get_project_ow
n
er() o
v
er get_fil
e
_
owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Va
j
na
D
o
c
u
ment -
<
n> for git
-
for
m
at-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree