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: refresh the index before calling a strategy
2008-10-03
Miklos Vajna
builtin-merg
e
: ref
r
esh the index
b
efore cal
l
in
g
a
s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
t76
0
3: add new testcase
s
to ensure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commi
t
: us
e
c
ommi
t
_
tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
los
V
ajn
a
commit_tree
(
): add a new a
u
thor parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t7501:
always
u
s
e
test_cmp instead
o
f diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajn
a
builtin-
m
erge:
release the
l
o
ckfile in try_merge_str
a
tegy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: ge
t
rid of virtual_i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursiv
e
: mov
e
c
u
rrent
_
{file,dire
c
tor
y
}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
jna
merge-recursive
:
m
ove the gl
o
b
a
l obuf to str
u
ct mer
g
e
_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
m
e
r
ge-r
e
curs
i
ve: get
r
i
d
of the index_o
n
ly global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
lo
s
V
ajna
merge-recursive: move call_de
p
th to stru
c
t
m
erge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os
V
ajna
Makefi
l
e: add mer
g
e_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os Vajna
cher
r
y-pic
k
/revert
:
make dire
c
t i
n
ternal call t
o
merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
b
uiltin-merge:
a
v
oid r
u
n_comman
d
_v_opt()
for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
merge-recu
r
sive: in
t
ro
d
uce merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Spli
t
out mer
g
e
_
re
c
ursive() to me
r
ge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos Vajna
Makefile: ena
b
le SNPRIN
T
F
_RETURNS_BOGU
S
for HP
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklo
s
V
a
jna
Fix
'gi
t
hel
p
he
l
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t93
0
0
:
r
e
p
la
c
e '!' with t
e
st_must_fai
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
iklos V
a
jna
Do
c
u
m
entation: docu
m
ent
t
he page
r
.
* c
o
n
f
iguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vajna
Builtin g
i
t-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-
h
el
p
: always load_command_
l
ist() in cmd_help(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
ik
l
os
Vajna
Add a
s
e
c
o
nd testcase for handling
i
nvalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
Add a n
e
w
t
est f
o
r u
s
in
g
a custom
m
e
rge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os V
a
jna
builtin-merge: allow us
i
ng
a
custom strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
builtin-help: make some i
n
t
e
r
nal fun
c
tions availab
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend
the
'merge picks up
t
he best r
e
sul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajn
a
builtin-merge: give a proper error message for
i
nvalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Teach
'
git merge' that some merge s
t
rategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
Ad
d
a
n
ew test f
o
r
g
it-mer
g
e-re
s
ol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
t60
2
1: add a new test f
o
r git-m
e
rge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
mak
e
remo
v
e-dashes: apply to scripts and pr
o
grams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
git-bisec
t
: use dash
-
less form on
git bisect
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t100
7
-h
a
sh-object
.
s
h: use quot
e
s
for the
t
est description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-
i
nit
.
sh: change confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los
V
a
j
n
a
Bui
l
d in
m
e
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
Vajna
Fix t760
1
-merge-pull-co
n
fig
.
sh
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
gi
t
-commit-tree: make
it
usab
l
e f
r
om other built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
Add new test case to e
n
sure
git-merge prep
e
n
d
s the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg-to-g
i
t: use
git init in
s
tead of
git init
-
db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: rewrite "g
i
t-frotz"
to "git fro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git: a
b
ort if the
p
roject directory
is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: a
v
oid rai
s
i
n
g a st
r
in
g
exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s Vajna
INSTALL: Update sect
i
on abou
t
git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid' me
r
ge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d ne
w
test case
t
o
ensure git-merge reduces oc
t
opus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Ad
d
new t
e
st
t
o
ensure git-merge
handl
e
s more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
I
n
troduce g
e
t_octopu
s
_
merge_bases()
in
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
git-fmt-mer
g
e
-msg: make it usable f
r
om
other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
M
o
v
e
r
e
a
d_c
a
che_unmerg
e
d() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Vajna
Ad
d
ne
w
test to
e
nsure gi
t
-merge handles pu
l
l
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move p
a
rse-
o
ptions's
skip_prefix() to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_co
u
nt() to comm
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove
s
p
l
it_cmdline() t
o
alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
na
path-list documentation
:
document all fu
n
ction
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
iklos Vajna
run-c
o
mman
d
do
c
umentation: fix "mem
s
e
t
()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
Vajna
git-read-t
r
ee: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
A
simple
s
c
r
ipt to par
s
e the resu
l
ts from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vaj
n
a
git-rebase -i: m
e
ntion the short
c
ommand aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
Remo
v
e unus
e
d c
o
de in
parse_comm
i
t_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajna
Strb
u
f doc
u
mentation
:
d
o
cume
n
t
mos
t
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos V
a
jna
Revision walkin
g
d
ocumentation: d
o
cument most i
m
p
ortant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
k
lo
s
V
a
jna
Codin
g
Gu
i
delines: Ad
d
a
not
e
to avoid assignments in
s
i
de
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mikl
o
s Vaj
n
a
git-merge: exclude unnecessary options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
k
l
o
s Vajna
git
-
fa
s
t-
i
mport
:
r
ename
cmd
_
*() fu
n
ction
s
to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
os V
a
jna
INSTA
L
L: add a note abou
t
GNU interactive tools h
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
a
jna
Add tests for sendemail
.
c
c
config
u
ration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Va
j
na
gi
t
-send-email: add
a new sendemail
.
c
c configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
o
s
V
a
jna
git-format-patch: add a new format
.
c
c
co
n
fi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
g
i
t ch
e
ckout: add -t
alias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vaj
n
a
diff options documentation:
r
efe
r
t
o
--di
f
f-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
contrib/hook
s
: add
a
n
example
p
r
e-aut
o
-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vajna
Documen
t
ation/hooks: a
d
d pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
git-g
c
--auto: add pre-au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation
/
git
-
merge
:
d
ocu
m
ent s
u
btree str
a
tegy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
i
klos Vajna
git-g
u
i: Updated
Hungarian
t
ranslation (e5fba18
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Updat
e
Hungarian translation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
los Vajna
Improve t6029
t
o check the real "subtree" cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mi
k
los Vajna
D
o
cum
e
ntation/git svn log
:
a
d
d a note a
b
o
u
t timezo
n
es
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Do
c
u
m
enta
t
i
on
/
git-
f
ilter-branch: add a new ms
g
-
f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
os
V
ajna
gi
t
-clean: handle er
r
o
rs if rem
o
ving fi
l
e
s
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
ajna
Documentation/git-stash: document options for git
s
t
ash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vaj
n
a
g
it clone -s do
c
umentati
o
n: fo
r
ce a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklos Vajna
buil
t
in-gc
.
c
:
guard
c
onf
i
g parser
from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git
rev-parse
m
a
n
page: spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull
m
a
npage: don't include -n from
f
etch
-
o
p
tions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
g
i
t-clo
n
e -s: document problems w
i
th g
i
t
gc --prun
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Include rev-list
o
ptions in git-log
m
anpag
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
remote: add
-
t an
d
-h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add usi
n
g merge su
b
t
r
e
e
Ho
w
-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
ajna
t/t7001: avoid unnece
s
sary ERE w
h
en usin
g
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
iklos Vajna
git-sh-setup: document gi
t
_edito
r
()
a
nd
get_au
t
hor_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mik
l
os Vajna
ev
e
ryday: replace 'prune' a
n
d 'repack' w
i
th '
g
c'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
o
s
Vajn
a
Upd
a
te Hungarian translati
o
n
.
100%
c
om
p
l
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vajn
a
In
c
lude
diff options i
n
the
git
-
log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mik
l
os
Vajna
git-sen
d
-email
:
add a n
e
w sendemail
.
t
o
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
ik
l
os V
a
jna
git s
t
ash: document ap
p
ly'
s
--in
d
ex switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundle
:
fix commandline examp
l
e
s
in the ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Manual: add a ch
a
pter
for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
V
ajn
a
Hungarian translation
o
f git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next