repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: avoid run_command_v_opt() for recursive and subtree
2008-08-31
Miklos Vajna
bui
l
tin
-
merge: avo
i
d
run_command_v_
o
pt
(
) for recursi
v
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
merge-recur
s
ive:
i
n
troduce merge_o
p
t
i
o
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Split out me
r
ge_recursive() to merge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
Vajna
M
a
kefi
l
e: enable SNPR
I
NTF
_
RETURNS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajna
Fi
x
'git help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
Vajna
t93
0
0: replace '!'
w
i
th test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: document the pager
.
*
co
n
f
i
guration
setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vaj
n
a
B
ui
l
tin git-hel
p
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Vajna
builtin
-
h
e
lp:
always load_comman
d
_list()
in cmd
_
help(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
ikl
o
s
Vajna
A
d
d
a sec
o
nd
testcase for handli
n
g inva
l
id strateg
i
es
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test f
o
r using a custom me
r
ge s
t
r
ateg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builti
n
-merge:
a
llo
w
using a custom s
t
rategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los V
a
jna
b
u
iltin-help: make
s
o
m
e
i
nte
r
nal f
u
nction
s
av
a
i
l
able
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s
Vajna
t
7
6
0
1
: extend
the 'merge picks up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajn
a
builtin-merge: give a proper error
m
essag
e
for i
n
va
l
id
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
ik
l
os Vajn
a
Teach 'git merge' that som
e
m
e
rge
s
trategi
e
s
n
o longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
ajna
A
d
d a
ne
w
test for git-mer
g
e-resol
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos
Vajn
a
t6021: ad
d
a new test for
g
it-merge
-
resolv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
ma
k
e remove-da
s
hes
:
apply t
o
scripts and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bis
e
ct: use dash-les
s
fo
r
m on git bis
e
ct log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007
-
ha
s
h-
o
bject
.
sh: use quotes for th
e
test descrip
t
ion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t
0
001-init
.
s
h
: change con
f
using direc
t
ory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajn
a
Bui
l
d
in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajn
a
Fi
x
t7601-merg
e
-pul
l
-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree
:
make it usab
l
e from
o
ther
b
uil
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case to ensu
r
e
git-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-to-git: use git init instea
d
of git
i
nit-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
o
s
V
ajna
hg-to-git:
r
ewrite
"
git-f
r
otz" to
"git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los
V
aj
n
a
hg-
t
o-git: abort i
f
the proj
e
ct d
i
rec
t
o
r
y is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajn
a
hg-t
o
-g
i
t: a
v
oid
r
aising
a string e
x
ce
p
tion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
lo
s
V
a
jna
INSTALL:
Upda
t
e sectio
n
a
b
out
git-
f
r
o
t
z form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vaj
n
a
Re
t
ire 'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
A
dd
n
ew test case to
e
nsure git-me
r
g
e reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd n
e
w test to ensure
git-merge handles more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajn
a
Intro
d
uce get_oc
t
opus_merge_bases(
)
in commi
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
g
i
t-fmt-merge-msg: mak
e
it usable from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move read_cache_u
n
merged() to re
a
d-cac
h
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
to
ensure gi
t
-merge han
d
les pull
.
two
h
ead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklo
s
Vajn
a
Move parse-o
p
tions's ski
p
_prefix() to git-co
m
pat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_count(
)
t
o com
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
M
o
ve split_cmdl
i
ne() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s Vajna
path-list
documen
t
ation: document all fun
c
tio
n
s and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documentation: fix
"m
e
mset()" pa
r
ameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-r
e
a
d-
t
r
e
e: document -v
o
ptio
n
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
A sim
p
le
s
cript to parse the resu
l
ts fr
o
m t
h
e
testcas
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Va
j
na
git-reb
a
se -i: mention the shor
t
command aliase
s
in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remo
v
e unused code in par
s
e_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf
d
ocu
m
e
n
tation
:
document most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Vajna
Revision walking documentation:
document most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos V
a
jna
CodingGuidelines: A
d
d a note to a
v
oid
a
ssig
n
ments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
g
i
t
-merge: exclude unne
c
essary options f
r
om OPTIONS_SPE
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklo
s
Vajna
git-fa
s
t-import
:
rename cmd_*() functions to par
s
e_*(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklo
s
Vajn
a
INSTAL
L
:
add
a
note about GNU inter
a
ctive
t
ool
s
h
a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s
Vajna
Add t
e
sts for sen
d
email
.
cc configuratio
n
vari
a
ble
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Va
j
na
gi
t
-send
-
email: add a new sendem
a
il
.
cc configurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
ik
l
os
V
a
jna
git-forma
t
-patch: add a new format
.
cc configurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklo
s
Vajna
g
it checkout: a
d
d
-t
a
lias
f
or
-
-track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos V
a
jna
diff opt
i
ons documen
t
a
t
io
n
: refer to --diff-filt
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/
h
ook
s
: add
an
example p
r
e-auto
-
gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
jna
Documentat
i
on/hoo
k
s: add
p
re-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
gi
t
-gc --au
t
o: ad
d
p
re-auto
-
gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
M
iklos Va
j
na
D
ocume
n
tat
i
on/git-merge:
d
oc
u
ment s
u
btre
e
strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
i
t-gui: Upda
t
ed Hungarian translation (e5fba18
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
iklos Vaj
n
a
Upda
t
e Hungarian translation
.
100% complet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
k
los Va
j
na
Imp
r
ove t6029 to check the real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklo
s
Vajna
Do
c
um
e
n
tation/git svn log
:
ad
d
a note about
tim
e
z
o
nes
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
iklos V
a
jn
a
Do
c
u
menta
t
ion/
g
i
t
-filt
e
r-branch: add
a new msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git
-
clean: handle
err
o
rs if removin
g
files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
iklo
s
V
ajna
Docume
n
t
ation
/
git-stash: docu
m
ent options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
ajna
git clone
-s doc
u
m
e
ntation: force a
n
ew par
a
graph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
builtin-gc
.
c: guard config parser f
r
om value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
o
s Vajna
git r
e
v
-parse
m
a
npage:
s
pe
l
ling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajn
a
git pull manpage: don't
i
n
clude -n
f
r
om fe
t
ch-o
p
t
i
on
s
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Mikl
o
s Vajna
gi
t
-cl
o
n
e -s: documen
t
proble
m
s
with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos Vajna
Include
re
v
-list
o
ptions
i
n
g
it-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os Vajna
ls-remote:
add -t and -
h
options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
i
kl
o
s
V
ajna
Add using merge subt
r
ee Ho
w
-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajn
a
t
/
t7001: avoid unnecessa
r
y ERE wh
e
n
u
sing grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-setup: document
g
i
t_editor() and
get_a
u
thor_ident
_
fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
every
d
ay
:
r
eplace '
p
r
u
ne' an
d
'rep
a
ck
'
with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajna
U
p
d
a
t
e
Hungar
i
a
n
translat
i
on
.
100%
c
ompleted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s
Vajna
Inc
l
u
d
e diff options in the git-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-email:
add a new sendemail
.
t
o
c
o
nfi
g
ura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
iklos Vajna
git st
a
s
h: document
a
pply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklo
s
Vajna
g
it-b
u
ndle: fix commandlin
e
exampl
e
s
in the m
a
npage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mik
l
o
s Vajna
User M
a
nual: add a
chapter for
s
ubmodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
i
klos V
a
jn
a
H
un
g
arian translatio
n
of git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os Vajna
git
w
eb:
new cgi para
m
eter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: prefer git_get_project_owne
r
() over get_file_o
w
n
e
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
i
klo
s
Vajna
Document -<n> for
g
it-form
a
t-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree