repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a new test for using a custom merge strategy
2008-07-30
Miklos Vajna
Add a new tes
t
for
using a custom
m
e
rge st
r
a
t
egy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
Vajna
builtin-merge: allow using a cu
s
t
om strateg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
b
u
il
t
in-h
e
l
p
: make
s
ome internal functions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
los Vajna
t7601: ext
e
nd the 'merge pic
k
s
up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
buil
t
i
n-me
r
ge: give a p
r
oper err
o
r message
f
o
r invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vajna
T
e
ac
h
'git me
r
ge' that some merge stra
t
e
gies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
Ad
d
a
new tes
t
for
git-merge-reso
l
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s V
a
jna
t6021:
add a
new test f
o
r git
-
merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-da
s
he
s
:
a
ppl
y
to scripts
and p
r
ograms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
g
it-
b
isec
t
: use
dash-le
s
s f
o
rm
o
n gi
t
bi
s
e
ct log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t1007-has
h
-obje
c
t
.
sh: u
s
e quotes for
the t
e
st descrip
t
ion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t0001-init
.
sh: c
h
ange confusing directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vaj
n
a
Build
in mer
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Va
j
na
F
i
x t7
6
0
1
-merge-pull-config
.
sh
on A
I
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
git-commit-tree
:
m
a
k
e
i
t u
s
a
bl
e
f
r
om oth
e
r builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Ad
d
n
ew test
case to ensure git-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s Vajna
hg-to-
g
it: use git i
n
it instead
of
g
it ini
t
-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: rewrite "git-frotz" to "git fro
t
z
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to-git:
abort if t
h
e
proje
c
t directory i
s
not
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos V
a
jna
hg-to-git: a
v
oid
raising a s
t
r
i
ng exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INST
A
L
L: Update section
abo
u
t git
-
f
rotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Ret
i
re 'stup
i
d' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s
Vajna
Add new test case
t
o
ensure git-merge reduces octop
u
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajna
Add new test to
e
nsure git-mer
g
e handles more t
h
an
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s V
a
jna
Introduce get_octopus_merge_bases() 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 usable f
r
om other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s
V
ajna
Move read_ca
c
h
e_unmerged() to r
e
ad-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test t
o
ensure git-merge handles p
u
ll
.
tw
o
head
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
M
o
ve
p
arse-options's skip
_
p
refix() t
o
git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
v
e
c
ommit_list_count()
t
o
c
om
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
Mo
v
e split_
c
mdline(
)
to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path
-
li
s
t documentation: d
o
cument all fun
c
tions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
u
n
-
co
m
mand documenta
t
ion: fix "me
m
set()" par
a
meter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos
V
ajna
gi
t
-rea
d
-tree:
d
ocument -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A
s
i
mp
l
e script
t
o
p
arse t
h
e
r
esults
from the
t
est
c
ases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos
Vajna
git-re
b
ase -i: men
t
ion
t
he short comm
a
nd aliase
s
in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
Remove un
u
sed c
o
de in parse_
c
om
m
it_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf document
a
t
i
on
:
document most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revisi
o
n wal
k
ing do
c
u
ment
a
t
i
o
n: document most
i
m
p
ortant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
Vajna
CodingGuidelin
e
s: Add
a note to a
v
oid ass
i
gn
m
ents ins
i
de
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
M
i
klos Vajna
git-merge: exclude u
n
necessary
o
ptions fro
m
OPTIONS_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
M
ikl
o
s Vajna
git-fast-import:
rename cm
d
_*() functions to parse_*(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add a note about
G
N
U interactiv
e
tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
Add tests for
s
endemai
l
.
cc c
o
nfiguration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
los Vajna
g
i
t-send-email: add
a new sendemail
.
cc
c
o
n
f
igur
a
tion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
a
j
n
a
git-format-patc
h
:
ad
d
a
n
ew format
.
c
c
configu
r
ation
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git c
h
eckout: a
d
d -t alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
V
a
j
n
a
d
i
ff o
p
tions
docum
e
ntation:
refer to --diff-
f
ilte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
ikl
o
s V
a
jna
cont
r
ib/hooks: ad
d
an
examp
l
e p
r
e-
a
uto
-
gc
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
Docum
e
ntation/hooks:
a
dd pre-aut
o
-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklo
s
V
ajna
git-
g
c --auto: a
d
d pr
e
-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
l
os Vajna
Document
a
t
i
on/git-merge:
d
oc
u
ment subtree s
t
rategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
Vajna
g
i
t-gui: Updated
Hungar
i
an tran
s
l
ation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hung
a
rian
t
r
a
nslation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
Vajna
I
m
prov
e
t6029 to check the real "
s
ub
t
ree"
case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
n
a
Documentation/g
i
t
s
vn log: add a note about
t
i
mezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
iklos Vajna
Documen
t
ati
o
n/git-filter-bra
n
ch
:
add a new msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vaj
n
a
git
-
clean: h
a
ndle er
r
ors if
rem
o
vi
n
g files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
jna
Documentat
i
on/git-stas
h
:
d
ocument
o
p
tions for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vaj
n
a
git clone -s doc
u
mentation: force a new par
a
g
r
a
p
h for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-
g
c
.
c
:
gua
r
d
config p
a
rser fr
o
m value
=
NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
i
k
los Vajna
git rev-pa
r
se
manpage: spelling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
l
o
s
V
a
jna
g
it pu
l
l m
a
npage
:
don't include -n from fetch-opti
o
ns
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vaj
n
a
git-clone -s: docum
e
n
t
problems with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Incl
u
de re
v
-list
opt
i
ons in git-log manpa
g
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
M
i
klos Va
j
na
ls-remote: add -
t
and -h opt
i
ons
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add
usin
g
merge s
u
btree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001: avoid
u
nnecessa
r
y E
R
E when us
i
ng grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git
-
sh-setup: docum
e
nt git_editor() and get_au
t
h
or_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
l
o
s
V
ajna
everyday: replace 'prune' and 'r
e
pack' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian translation
.
100% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vaj
n
a
I
nclude diff options in the git
-
log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos
Vaj
n
a
git-
s
e
nd-
e
mai
l
: ad
d
a new
s
ende
m
a
i
l
.
to configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
ik
l
os Vajna
git
stash: document
a
pply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajn
a
git-b
u
nd
l
e: fix comman
d
line examples
in
the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Va
j
n
a
User Ma
n
ual: add a chapter
for
s
ubmodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hun
g
arian translation of git
-
gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
M
i
klos Vajna
gitweb
:
new cgi pa
r
amet
e
r: op
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: prefer git_get_pr
o
je
c
t_owner() over get_file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
los Vajna
Document
-<
n
>
for g
i
t
-
format-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree