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
cherry-pick/revert: make direct internal call to merge_tree()
2008-09-03
M
i
k
l
os Vajna
cherry-
p
ick/revert: ma
k
e direct internal call to m
e
r
g
e_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avoid run_command_
v
_opt() for recursiv
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
me
r
ge-recursive: intro
d
uce me
r
ge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Va
j
na
S
p
l
i
t out merge
_
recur
s
ive
(
) to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los Vajna
Ma
k
ef
i
le: enab
l
e SNPRIN
T
F_
R
ETURNS_BOGUS for
H
P
-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git h
e
l
p
h
elp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t9300: replace '!'
w
ith test
_
m
u
st_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos
Va
j
na
Documentati
o
n: document the
p
age
r
.
* config
u
ration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Bui
l
tin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
i
klos Vajna
b
uiltin-h
e
lp: always lo
a
d_
c
o
m
mand_lis
t
() in cmd
_
h
elp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a second testcase for han
d
ling inv
a
lid strat
e
gies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
Add a new test for usin
g
a c
u
stom merge
s
trateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos
V
ajn
a
b
u
iltin-merge: a
l
low using a cust
o
m strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
builtin-help:
m
a
k
e
some internal
functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Vajna
t7601: extend the 'merge picks up the
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builti
n
-
m
erge: give a p
r
oper err
o
r message
f
or in
v
alid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git
m
erge' that some merge strategies
n
o lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajn
a
Add
a
n
ew test
f
or git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
l
o
s Vajna
t602
1
: ad
d
a new test f
o
r git-merge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
os
Vajn
a
m
ake remove-d
a
shes
:
appl
y
to scri
p
ts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
git-bisect:
u
se da
s
h-less fo
r
m
on git
b
i
sect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klo
s
Vajna
t
100
7
-hash-obje
c
t
.
sh: use quotes for t
h
e test des
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t0001-init
.
sh:
c
h
a
nge confu
s
i
ng directory n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
i
n
m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
F
i
x
t7601-merge-pull-c
o
nfig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
git-commit-tree: make it
u
sabl
e
from o
t
her bui
l
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new
t
est
c
ase to ensure git-merge prepends
th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
it: use git init instead of git i
n
it-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to
-
git:
rewrit
e
"git-fr
o
tz" to "git
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-t
o
-gi
t
: abort if the projec
t
d
i
r
ec
t
o
ry is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
h
g-to-git: avoid ra
i
s
i
ng
a
string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INS
T
ALL
:
U
p
dat
e
section about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid' merge s
t
rate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add new
test case to ensu
r
e git
-
mer
g
e
r
e
duces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los
Vajna
Add new test to
ensure git-mer
g
e handles more t
h
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
I
n
troduce get_octopus_
m
erge_bases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
git-fmt-merge-msg:
m
a
k
e
i
t
u
s
able
from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajn
a
Mo
v
e
r
e
a
d_cache_unmerge
d
()
t
o read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajn
a
Add new
test t
o
ensu
r
e git-merge handle
s
pu
l
l
.
t
w
ohead
.
.
.
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-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move comm
i
t_list_count() t
o
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve
spli
t
_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list documen
t
ation: doc
u
ment all functi
o
n
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
r
un
-
command docume
n
tation: fix "mems
e
t()" param
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: document -v
o
pti
o
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
A
s
imple script to
p
arse the r
e
sults from the
test
c
ases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
git-re
b
ase -i: me
n
t
i
o
n
t
h
e sh
o
r
t
command alia
s
es in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
R
emove un
u
sed cod
e
in
p
a
rse_comm
i
t_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Va
j
na
Strbuf doc
u
mentation: document mo
s
t funct
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Va
j
n
a
Revision walking
d
ocume
n
tation: documen
t
most import
a
nt
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
iklos
V
ajna
CodingGuidelines: A
d
d a note to avoid assignm
e
nts inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-m
e
rge: exclude unn
e
ces
s
ary optio
n
s from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
klos Vaj
n
a
git-fast-import: rename
c
md_*() functi
o
ns to parse_
*
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
IN
S
TALL:
add a note a
b
o
ut GNU
i
n
t
eracti
v
e tool
s
h
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests for
s
endemail
.
cc
configur
a
tion va
r
i
a
bl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
l
o
s
Vajna
gi
t
-send-email:
a
dd a new sendemai
l
.
cc configurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
ikl
o
s Vajna
git-format-p
a
t
c
h: add a new format
.
cc config
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mikl
o
s Vajna
g
i
t chec
k
o
u
t: add -
t
alias for --
t
rack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mikl
o
s
Vajna
d
iff
o
pti
o
ns documentation
:
ref
e
r to --dif
f
-f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
contr
i
b
/hooks
:
add an e
x
a
m
ple pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
l
os
Vajna
Docume
n
tatio
n
/h
o
oks: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s
Vajna
g
it-gc --auto: add
p
re-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vaj
n
a
Documenta
t
io
n
/git-
m
erg
e
: docu
m
ent subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
l
os Va
j
n
a
git-gui: Updat
e
d
Hu
n
garian transl
a
tion (e5
f
ba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update
Hunga
r
i
a
n translation
.
100% co
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
m
prove t602
9
to check the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mikl
o
s Vajna
Doc
u
ment
a
tion/g
i
t sv
n
lo
g
: add a n
o
te about
t
i
m
e
z
o
nes
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Va
j
na
D
ocu
m
entation/git-filter-branch:
a
dd
a
new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: han
d
l
e
errors if removing
file
s
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vaj
n
a
Docum
e
ntation/git-stash: document
o
pt
i
ons for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vajna
git cl
o
ne -
s
documen
t
at
i
on: force a ne
w
para
g
r
aph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s
V
a
jn
a
b
u
iltin-gc
.
c: guard config pars
e
r fr
o
m value=NU
L
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
gi
t
rev-parse manpage
:
sp
e
lling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
g
it pu
l
l manpage:
d
o
n't include -n from f
e
tch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
i
klos
V
ajna
g
i
t-clone
-s:
docume
n
t problems
with gi
t
gc
--prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
iklos Vajna
Include r
e
v-list
options in git-log
m
a
n
page
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
remote: add -t and -h optio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
iklos Vajna
Add usin
g
merge subtr
e
e How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vaj
n
a
t/t7001: avoid unnecessary
ERE wh
e
n using
g
rep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
i
k
l
o
s
Va
j
na
gi
t
-
sh-setup: document git_editor
(
)
a
nd get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
l
os Vaj
n
a
ever
y
day: replace 'prune' an
d
'repack'
with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vaj
n
a
U
pdate H
u
ngarian transla
t
ion
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
I
n
clude dif
f
o
p
tions in
the git-
l
og manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mi
k
los Vajn
a
g
i
t
-
send-email: add
a
new
sendemail
.
to confi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash: document appl
y
's --ind
e
x
s
witch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-b
u
ndle: fix commandline examp
l
es in th
e
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Man
u
al:
add
a
cha
p
ter
f
or submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mi
k
l
os
V
ajna
Hu
n
garian translation of git
-
gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajn
a
gitw
e
b: new
c
gi
parameter
:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vajna
gitweb: prefer
g
i
t_get_project
_
owner() over get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Document -<n> for git-format
-
patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree