repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move the global obuf to struct merge_options
2008-09-05
Miklos Vajna
m
e
rge-recursive: move the global obuf to str
u
ct merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajn
a
mer
g
e
-
recursive: get rid of the index_o
n
ly
g
lo
b
al variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajn
a
me
r
ge-recursive:
m
ove call_depth to
s
tr
u
c
t
merge_optio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
los Vaj
n
a
ch
e
rry
-
p
i
ck/rev
e
rt:
ma
k
e direct i
n
ter
n
a
l c
a
ll to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
builtin-m
e
r
ge:
a
void ru
n
_comman
d
_
v_opt() for recursiv
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
e
rg
e
-recursive: introd
u
ce merge_op
t
io
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
Split o
u
t merge_
r
ecursi
v
e()
t
o merg
e
-recu
r
sive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
Vajna
Makefile:
e
nable SNPRINT
F
_RETURNS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajn
a
Fix 'git he
l
p help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: repl
a
ce '!' w
i
th test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los Vajna
Docum
e
ntation: documen
t
the pag
e
r
.
*
c
onfigu
r
ation settin
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
uiltin gi
t
-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin
-
help: always load_
c
o
mmand_list() in cmd_hel
p
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a second
t
e
stcase for handling invalid strategi
e
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los V
a
j
n
a
Add
a
n
ew test for using a cu
s
tom merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
builtin-mer
g
e: allow using
a
custom strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
lti
n
-
h
elp
:
make some
internal funct
i
ons available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend the 'merge pic
k
s up the b
e
st re
s
ult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
i
kl
o
s Vajna
built
i
n-merge:
g
ive a proper error
m
essage fo
r
in
v
alid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
i
klos
V
ajn
a
Teach 'git me
r
ge' t
h
at som
e
merge strategies no
l
o
nger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
n
a
A
d
d
a new test f
o
r
git-merge
-
r
e
so
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
ajn
a
t
60
2
1
:
add
a n
e
w
t
est f
o
r git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove
-
dashe
s
: apply to
scr
i
p
ts and pro
g
rams as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
g
it
-
b
i
sect: u
s
e dash
-
less for
m
on git bis
e
ct log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajn
a
t1007-hash-obje
c
t
.
sh: use quotes
f
or t
h
e test descripti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
t000
1
-init
.
s
h
: change confusing
directory nam
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in mer
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los V
a
jna
F
ix t76
0
1-me
r
ge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
git-commi
t
-tree: m
a
ke it usable from oth
e
r
builti
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Va
j
na
Add
new test case to ensur
e
git-me
r
ge p
r
epen
d
s
the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
lo
s
Vajn
a
h
g-to-
g
it: us
e
git init inste
a
d
o
f
git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-t
o
-git
:
rewrite "git-frotz"
to
"
git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git: abort if
t
he project directo
r
y is
n
o
t
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
aj
n
a
h
g-to-git: avoid raisi
n
g a
str
i
ng exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
IN
S
TALL:
U
pd
a
te sect
i
on about git-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
V
ajna
Retire 'stupid' merge strateg
y
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajn
a
Add new
t
est case to ensure g
i
t-
m
erge reduces
o
ctopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
A
d
d new
t
e
st to ensur
e
git
-
merge handles more tha
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
aj
n
a
Introdu
c
e
get_
o
ctopu
s
_merg
e
_b
a
ses() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
git
-
f
m
t-mer
g
e
-msg:
mak
e
it usable
from other b
u
iltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cache_unmerged()
to read-ca
c
he
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test to ensure gi
t
-me
r
ge han
d
les pull
.
twohea
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move parse
-
options's s
k
ip_pr
e
fix() to git-compa
t
-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
v
e commi
t
_
list_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move
s
plit_cmdl
i
ne() t
o
alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Vajna
path-list documentation: docume
n
t a
l
l functio
n
s
a
nd
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os Vajna
r
u
n-c
o
mm
a
nd documentation: fi
x
"mems
e
t()" paramete
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tr
e
e: document -v op
t
ion
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple scrip
t
t
o parse the r
e
sults from the te
s
tcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase -i:
mention the short
command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
a
jna
Remove unused code in parse_co
m
mit_buffer
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Va
j
na
Strbuf documentation: do
c
ument
m
ost
f
unctions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
R
evision walking documenta
t
ion: document
most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Vajna
CodingG
u
idelin
e
s: Add a note to
a
void assignme
n
ts inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos Vajn
a
git-merge: exclud
e
unnecessary options fr
o
m OPTIONS_SPE
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
M
iklos
V
ajna
git-fast
-
i
m
port
:
rename cmd
_
*() f
u
nctions to par
s
e_
*
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
o
s Vajna
INST
A
LL: add a note abou
t
GNU interactive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Ad
d
tests for sendemail
.
cc
con
f
igurati
o
n varia
b
le
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajn
a
git-send-email: a
d
d
a
new
sendemai
l
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os
Vajna
git-format-patch: add
a
new fo
r
m
at
.
c
c
confi
g
uration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Mi
k
los Vajn
a
git ch
e
ckout: add -t al
i
as for --trac
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
o
s Vajna
d
iff o
p
tion
s
documentation:
ref
e
r to --d
i
ff-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
contrib/hooks:
a
dd
an
exa
m
ple
pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
Docum
e
ntat
i
on
/
h
o
oks: add pre
-
auto-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
g
i
t
-gc --
a
uto
:
ad
d
pre-
a
u
t
o
-gc ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Docu
m
entation/git-merge: document subtree strat
e
g
y
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
Vajna
git-gui:
U
p
d
ated Hungarian translati
o
n (e
5
f
ba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos V
a
jna
Upda
t
e
Hu
n
g
a
ria
n
t
r
a
n
s
l
ation
.
100%
c
o
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajn
a
Improve t6029
to ch
e
ck the r
e
al "su
b
tree
"
case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
Vajna
Docu
m
en
t
ati
o
n/gi
t
svn
l
og:
add a n
o
te
a
bout timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
iklos Vajna
Doc
u
men
t
at
i
on/git-fil
t
er-branch:
add a
n
e
w 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 removing fil
e
s
f
ails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajn
a
D
o
cumentation/git-stash: d
o
cument options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Vajna
git cl
o
ne -
s
documentati
o
n: f
o
rce a
n
ew paragra
p
h
f
or
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vaj
n
a
builtin-gc
.
c: guard config parser from value=NUL
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
i
k
los Vajna
git r
e
v-pa
r
se
m
anpage:
spelling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Mik
l
o
s Vajna
git pull manpage: don't i
n
clude -n from fetch-op
t
ions
.
t
x
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos V
a
jna
g
i
t-
c
lone
-
s
:
document
problems with git gc
-
-prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
V
ajna
In
c
lude rev-list options in git-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
Miklos V
a
jna
Ad
d
using merge s
u
btree Ho
w
-T
o
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Mi
k
los
Vajna
t/t7001:
avoid unnecessar
y
E
RE when using
g
rep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Mik
l
o
s
Vaj
n
a
git-sh-setup: doc
u
ment git_editor() and get_author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mikl
o
s Vajna
everyday: replace
'
prune' and 'repack' wit
h
'gc
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
a
j
n
a
Updat
e
H
u
ngarian tr
a
n
slat
i
on
.
100%
c
ompl
e
ted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os V
a
jna
Include
diff optio
n
s in the git-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos V
a
j
n
a
git-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 sta
s
h:
d
ocument app
l
y's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos V
a
jna
git
-
bundle: fi
x
co
m
ma
n
dline exa
m
ples
i
n the manpa
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
Use
r
Man
u
al: add a c
h
apter for subm
o
dules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
H
ungarian translation o
f
git
-
gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os Vajna
gitw
e
b
: new cg
i
parameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
lo
s
Vaj
n
a
gitweb:
p
r
efer gi
t
_get_project_ow
n
er() ov
e
r get_fil
e
_ow
n
er()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
los V
a
jna
Document -
<
n>
f
or git-forma
t
-
p
atch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree