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
Split out merge_recursive() to merge-recursive.c
2008-08-31
Mikl
o
s Va
j
na
S
p
li
t
out
merge
_
r
ecur
s
ive() to m
e
r
g
e
-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
aj
n
a
Makefile: enable
S
NPR
I
NTF_RETURNS
_
BOGUS
for
H
P-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajna
Fix 'git help
h
elp'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
los
V
ajn
a
t
9300: replace
'!'
w
i
t
h test_must_fa
i
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation:
document the pager
.
*
c
onfigu
r
ation setti
n
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
M
i
klos Vajna
Buil
t
in gi
t
-hel
p
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Mik
l
os Vajna
bu
i
ltin-hel
p
: always lo
a
d_co
m
m
and_list() i
n
cmd
_
help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
Add a second t
e
stcas
e
for handling invalid st
r
ategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Va
j
na
A
dd a new t
e
st for us
i
n
g
a
c
ust
o
m mer
g
e strat
e
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-m
e
rge: allow u
s
ing a c
u
st
o
m str
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-
h
e
l
p: make some inter
n
al funct
i
ons ava
i
lable
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
i
k
l
o
s
Vajna
t7601: exten
d
the 'merge picks
u
p the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: giv
e
a
prop
e
r
error me
s
sag
e
f
or invali
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge
'
that some merge str
a
tegies
no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new t
e
st for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
t
6021: add a new
t
e
st for
git-merg
e
-reso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
m
a
ke remove
-
dashes: apply to scrip
t
s and
pro
g
rams as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
i
t-bi
s
e
c
t: use
da
s
h
-
l
e
ss for
m
o
n git bise
c
t log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos
V
a
j
n
a
t1007-hash-
o
bje
c
t
.
sh: use q
u
o
tes for
t
h
e test descr
i
pti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klo
s
V
ajna
t0001-in
i
t
.
sh
:
change co
n
f
u
sin
g
directory n
a
me
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
V
a
jna
Bu
i
ld in mer
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
Fix
t7601-merge-pull-config
.
sh on AI
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
git-c
o
m
m
it-tree:
m
ake it usable from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new t
e
s
t ca
s
e to ensu
r
e git-merge prepends
the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-git: use g
i
t init instead of git ini
t
-
d
b
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
:
rewrite "git-frotz" to "
g
it frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-
t
o-
g
it
:
abort
i
f
the project directory is not
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avo
i
d raising a strin
g
except
i
on
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
IN
S
TALL: U
p
date section about git-frotz
f
or
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
los
V
ajna
Retire 'stup
i
d
' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
st case to ensure
g
i
t-me
r
ge r
e
duces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new
t
e
st t
o
ensure git-merge handles m
o
r
e
tha
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce ge
t
_o
c
topu
s
_m
e
rge
_
bases() in c
o
mmit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
git-fmt-merg
e
-ms
g
: make it usable from other bui
l
tins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move
read_cache_unmerged
(
) to
read-c
a
c
he
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
A
d
d new test to
e
nsure git-merge handles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move par
s
e-options'
s
skip_prefix()
to
gi
t
-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
os
V
aj
n
a
Move c
o
mmit_list
_
c
o
u
nt(
)
to comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move split_
c
mdline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
path-
l
ist
d
ocumentation:
d
ocumen
t
all func
t
ions a
n
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
iklo
s
V
a
j
na
run-command doc
u
mentation: fix "mem
s
e
t
()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vaj
n
a
git-read-tree: docu
m
e
n
t -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los
Vajna
A si
m
ple
s
cript to parse
t
he r
e
sults from the
testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Va
j
na
git-rebase
-
i: mention
t
he short
command ali
a
ses in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused c
o
d
e
in parse
_
commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Mikl
o
s Vajna
S
trbu
f
docume
n
t
a
tion: d
o
cument mos
t
fu
n
ct
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
i
k
los Vajna
Rev
i
sion walking d
o
cu
m
entat
i
o
n
: docu
m
ent
m
ost
i
m
p
o
r
tant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklo
s
Vaj
n
a
CodingGui
d
eli
n
es
:
A
d
d a note
t
o
a
void assignmen
t
s
ins
i
d
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Va
j
na
git
-
me
r
ge: e
x
c
l
ude un
n
e
c
essar
y
options fro
m
OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
M
i
klos Vajna
gi
t
-fast
-
import: rename cmd
_
*
(
) functions
to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
ajna
INSTALL: add
a
n
ote about G
N
U interactive tools ha
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
A
d
d tes
t
s
f
or sendemail
.
cc configuration vari
a
bl
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajna
g
i
t
-send-e
m
ail: add a new
s
e
nd
e
mail
.
c
c conf
i
guration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los V
a
j
n
a
gi
t
-forma
t
-patch: add a new format
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos V
a
jna
git c
h
eckout:
a
d
d
-
t alia
s
for
--track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mikl
o
s
Vajna
d
i
ff options do
c
umentation: refe
r
to --diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s
Vajna
c
o
ntrib/hooks: add an example
p
re-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
Doc
u
mentation/hooks: add pre-a
u
to-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
g
it-gc
--a
u
to: add pre-a
u
to-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
los
Vajna
Documen
t
a
tion/
g
i
t-merge: documen
t
sub
t
ree
strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajn
a
g
i
t-gui:
U
pdated Hu
n
garian tra
n
slation
(e
5
fb
a
1
8)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
i
klos Vajna
Update Hungarian translat
i
on
.
100% comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t602
9
to check the real "subt
r
ee" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Mi
k
los Vajna
Documenta
t
ion/git
s
v
n
log: add a note about timezone
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vajn
a
Documenta
t
i
on
/
g
it-fil
t
er-branch: a
d
d
a new
m
sg-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mikl
o
s Vajna
git-clean: handle errors if remov
i
ng files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
iklos Vajna
Documentation/
g
it
-
st
a
sh: doc
u
men
t
op
t
i
ons for git s
t
ash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vaj
n
a
git c
l
one -s
documentation:
f
o
rce a new pa
r
agraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Va
j
na
builtin-gc
.
c
:
guard c
o
n
fig parser f
r
om
v
a
lue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git r
e
v-parse manpa
g
e: spelling fi
x
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vaj
n
a
git pull manpage:
d
on't
incl
u
de -n from f
e
tch-op
t
ions
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vaj
n
a
git-clone -s
:
document problems with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos Vaj
n
a
Include rev-list options in
gi
t
-log man
p
age
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos V
a
jna
ls-r
e
m
ot
e
: add -t an
d
-
h
options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajn
a
A
d
d usin
g
m
e
r
ge subtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
ajna
t
/
t7001: avoid unnecessary E
R
E when using gre
p
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klos Vajna
git-sh-setup:
do
c
ument gi
t
_editor() and ge
t
_author_ident_f
r
o
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos
V
ajna
everyday: rep
l
ace 'prune' and 'repack' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update H
u
ng
a
rian translation
.
100% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vaj
n
a
Include diff options in the git-
l
og
m
an
p
age
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Mikl
o
s Va
j
na
git-send-email: add a n
e
w
s
endemail
.
to configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
i
kl
o
s Vaj
n
a
git sta
s
h: d
o
cument apply's --ind
e
x
switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos
V
ajna
git
-
bu
n
dle: fix commandli
n
e examples in
t
he manpage
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
Mikl
o
s
Va
j
na
Hungarian
t
ranslati
o
n of git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
los Vaj
n
a
gi
t
web:
n
e
w
cgi parameter: o
p
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
M
i
klo
s
Vajn
a
g
itweb: p
r
e
f
e
r g
i
t
_
get_
p
r
o
ject_o
w
ner() over get_file_own
e
r
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
l
o
s
V
a
jn
a
Document -
<
n
> for
git-form
a
t-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree