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: get rid of the index_only global variable
2008-09-05
Mikl
o
s
V
ajna
merge-recu
r
s
ive: get rid of the index_only gl
o
bal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
i
klo
s
Vajn
a
m
erge-
r
ecurs
i
ve: move call_depth
to struct mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
cherry-pic
k
/revert: make dire
c
t
internal ca
l
l to merge
_
tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos
Vaj
n
a
b
uil
t
in-merge: avo
i
d run_command_v_opt() for r
e
curs
i
ve
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
me
r
ge-recu
r
sive: introduce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los V
a
jna
Split out
m
erge_recurs
i
v
e
()
t
o
m
erge-recursiv
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos Vaj
n
a
Makefile: enab
l
e SNPRINTF_RETURNS_
B
OGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajna
Fix 'git help help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
jna
t
9
300: replace '!
'
with test_mus
t
_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajn
a
Docu
m
entation: do
c
ument the
p
ager
.
* configur
a
tion
s
ett
i
ng
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
iklos Vajn
a
Builtin git-hel
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mi
k
lo
s
Vajna
builti
n
-help: al
w
ay
s
l
o
ad_comma
n
d
_list() in
cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add
a
sec
o
n
d
testcase for
handl
i
ng invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
V
a
jna
Add a new test fo
r
using a custom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
u
i
l
t
in-merge: all
o
w u
s
i
n
g a
c
ustom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-
h
elp: make
some internal functi
o
ns
a
vail
a
ble
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Vajna
t
7601: exten
d
the '
m
er
g
e picks up th
e
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vajna
builti
n
-merge: give a pro
p
er error message
f
o
r
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
o
s
Vajna
T
e
ach 'gi
t
merge' that some me
r
ge str
a
tegies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
Add a
n
ew
t
est for
git-
m
erge-r
e
s
o
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a
n
ew test for git
-
m
e
r
ge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
los Vajn
a
mak
e
remove-dashes: apply to scrip
t
s a
n
d pr
o
gram
s
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-bis
e
ct:
u
s
e dash-less
f
o
rm
on
g
i
t
bisect
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t1
0
0
7
-
hash-object
.
sh
:
u
se q
u
otes for the test de
s
cription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t0001-init
.
sh: change
c
o
n
fusing direct
o
ry name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos
V
ajna
Build i
n
m
erge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fi
x
t7601-merge-pu
l
l-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
aj
n
a
git-c
o
mmit-tree: make it
u
sable from other b
u
iltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
d
d
new
t
est cas
e
to ensure git-merge prepend
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s
Vajna
hg-to-
g
i
t: use git ini
t
inst
e
ad of
git init-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s V
a
jna
hg-to
-
git: rewrite
"git-frot
z
"
t
o "git frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: abort if
t
he p
r
o
j
e
ct dir
e
ct
o
ry is
n
ot a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avoid raising
a
s
tring
e
xception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL
:
Update
se
c
tion about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
los V
a
jna
Ret
i
re '
s
tupid'
merge
s
trategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new te
s
t case to en
s
ure
g
i
t-merge
r
edu
c
es
oct
o
p
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to ens
u
re git-merge h
a
ndle
s
more
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Introduce get_o
c
topus
_
m
erge_
b
ases()
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make it usa
b
le from ot
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
M
o
ve
read_cache_un
m
e
r
g
ed()
t
o
read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
Vajna
Add ne
w
t
e
s
t
to
e
ns
u
re gi
t
-merge handles pull
.
tw
o
head
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move par
s
e-option
s
's skip_prefix() to git-co
m
p
a
t-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Mo
v
e commit_list_c
o
u
n
t() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move split_cmdline()
t
o alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
p
a
th-list
d
o
c
umentati
o
n: d
o
c
u
ment all fun
c
tions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-com
m
and docu
m
entation
:
fix "m
e
mset()"
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
git-read-
t
ree: docume
n
t -v opt
i
on
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
A simple script
t
o par
s
e the r
e
s
u
lts from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
git-reb
a
se
-i: me
n
tion
t
he short comm
a
nd aliases
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos
Vajna
Remo
v
e unused code in
parse_
c
ommit
_
buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos V
a
jna
S
t
r
buf documenta
t
ion: d
o
cument
m
ost
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
Vajna
Revision w
a
lking documentation:
docum
e
nt most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Cod
i
ngGu
i
delines:
Ad
d
a no
t
e t
o
avo
i
d ass
i
gnments 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 unnece
s
sar
y
options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
iklos Vajna
git-fast-import: rename
c
md
_
*() funct
i
on
s
to parse_
*
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mikl
o
s Vajna
INSTALL
:
ad
d
a
n
ote a
b
out GNU
inter
a
ctive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
A
d
d tests for s
e
ndemail
.
cc configuration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s
V
ajn
a
git-s
e
nd-
e
mail: ad
d
a new sendemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-p
a
tch: add a new forma
t
.
cc
configur
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git
c
hec
k
out: add -
t
alias
for --trac
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
l
o
s
Vajna
diff
options d
o
cu
m
en
t
ation: refer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contr
i
b/hooks:
add an example pre
-
auto-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation
/
hooks:
add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-g
c
--a
u
t
o:
a
d
d
pre-auto-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
iklos Vajna
Documentation/git-me
r
ge: document sub
t
ree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
i
t
-
g
ui:
U
pdate
d
Hungaria
n
tr
a
ns
l
ation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Updat
e
Hungaria
n
translation
.
100% compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
V
ajna
Improve t6029 to check the rea
l
"su
b
tree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
klos Vajna
Docu
m
e
ntati
o
n/git
svn log:
add
a
note about timezone
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
D
o
cum
e
ntation/git-filter
-
branch: a
d
d
a new ms
g
-
f
i
l
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos
Va
j
na
g
it-clean: handle
er
r
ors if removing files
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
ajna
D
ocume
n
tati
o
n/git-stash: document options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -
s
do
c
umentation: for
c
e a new
para
g
raph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin
-
gc
.
c
:
guard
c
on
f
ig parser from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
i
klos V
a
jna
git rev
-
parse manpag
e
:
spelling
f
ix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpage: do
n
't include -n
f
ro
m
fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s: document problems with 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 options in git-log m
a
npage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-re
m
ote: add -t and -h op
t
ions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
iklo
s
Vajna
t
/
t700
1
: avoid
u
nnecessary ER
E
when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klo
s
Vajna
g
i
t-
s
h-setup: document git_editor() an
d
get_author_ident
_
fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
i
klos Vajna
eve
r
yday: replace '
p
rune' and 'repack' wit
h
'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos
V
ajna
Update Hungaria
n
tran
s
lation
.
100%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include diff options in the git-log
manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
iklos Vajn
a
git-send-email:
a
dd a new sendem
a
i
l
.
to config
u
rat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git
s
t
a
s
h: document apply
'
s -
-
ind
e
x switch
commit
|
commitdiff
|
tree
2007-09-29
Mi
k
los
Vajna
git
-
bundle: fix
c
omma
n
dline examples in the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
ik
l
os Vajna
Us
e
r Manual: add
a
cha
p
ter for su
b
modul
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
Vajna
Hungaria
n
trans
l
a
tion of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklo
s
V
a
jna
gitweb: new cgi p
a
rameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
M
i
k
l
os Vajna
gitweb: p
r
e
f
er git_
g
et_proj
e
ct_owne
r
(
) over ge
t
_f
i
le_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
M
iklos Vajn
a
Docume
n
t -<n> f
o
r git-fo
r
mat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree