repo.or.cz
/
git
/
mjg.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
Mik
l
os Vajna
che
r
ry-
p
ick/re
v
ert: make direc
t
int
e
rnal c
a
ll to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
a
j
n
a
b
uiltin-
m
erge:
a
v
o
id run_command_v_op
t
() for recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajna
merg
e
-recur
s
ive: intro
d
uc
e
mer
g
e_o
p
tio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vaj
n
a
Spl
i
t out merge_recursive() to merge-
r
ecursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
Vajna
Makefile: enable SNP
R
INT
F
_
RETURNS_BOGUS for
H
P-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajn
a
Fi
x
'git
help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vaj
n
a
t9300: rep
l
ace
'
!' wi
t
h
t
est_must
_
fai
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: doc
u
ment the pager
.
* configura
t
ion setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
V
ajna
Builtin g
i
t-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vaj
n
a
built
i
n-help: always lo
a
d_command_list() in cmd
_
he
l
p()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a se
c
ond
t
estcase for handl
i
n
g
inv
a
lid st
r
ate
g
ies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
Add a new test f
o
r
u
s
in
g
a
custom merge strat
e
gy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-merge: allow
using a cu
s
tom strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
builtin-
h
elp: ma
k
e some internal fu
n
ctions avai
l
able
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos Vajna
t7601:
extend the
'
merge picks
up the b
e
st resul
t
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajn
a
bui
l
tin-merge:
give a proper e
r
r
or message for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
i
kl
o
s Vajna
Te
a
c
h
'git merge' that
some merg
e
strategies
no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klo
s
Va
j
n
a
Add
a
new te
s
t
for git-merg
e
-resolv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6021: add
a
new te
s
t for git-merge-re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
make re
m
ove-dashes: appl
y
to
scripts and
pro
g
rams
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: u
s
e da
s
h-
l
e
ss form
on g
i
t bi
s
e
ct l
o
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-object
.
sh: u
s
e q
u
ote
s
for the test de
s
cription
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-i
n
it
.
sh: change confusing director
y
name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
ld in m
e
rge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos
Vajna
Fix t7601-merge-p
u
ll
-
confi
g
.
s
h
o
n AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
git
-
commit-t
r
ee: make it usable from
o
t
her b
u
il
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajn
a
Add new test
c
ase to
e
ns
u
re
g
i
t-me
r
g
e prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s Vajna
hg-to-git: use
git init inste
a
d
o
f
git ini
t
-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-gi
t
: re
w
rite "git
-
frotz"
t
o "git fro
t
z
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
it: abort if the project directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
h
g
-
to-gi
t
: avo
i
d r
a
i
sin
g
a st
r
in
g
except
i
on
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s Vajna
I
N
S
T
ALL: U
p
date section about g
i
t-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Mik
l
os
V
a
j
na
Retire 'stupid' merge s
t
rate
g
y
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add
new test cas
e
to
e
nsure gi
t
-
m
erge r
e
duces oct
o
pus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add new test to ensure git-merge
handl
e
s more th
a
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
Vaj
n
a
Introduce ge
t
_octopus_merge
_
bases(
)
in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-f
m
t-m
e
rg
e
-m
s
g: mak
e
it u
s
abl
e
from othe
r
buil
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
Move read
_
c
ache_unmerged() to read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s
Vajna
Add new test t
o
ensure git-merge hand
l
es
p
ull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-options's skip_pr
e
fix() to g
i
t-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve commit
_
lis
t
_count()
t
o commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move split_cmdline() to al
i
as
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-l
i
st docume
n
tation:
d
ocument all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
a
jna
r
u
n
-command docum
e
nta
t
ion
:
fix "memset()" par
a
meter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: document -v
option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
a
jna
A
s
i
mple
script to parse the results f
r
o
m th
e
tes
t
c
a
ses
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vaj
n
a
gi
t
-
rebase
-
i: m
e
n
ti
o
n
t
he sho
r
t command aliase
s
in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Va
j
n
a
Remove
u
n
used
c
od
e
in pars
e
_commit_
b
uffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
ik
l
os Va
j
na
Strbuf documentation: document most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklo
s
Vajna
Re
v
ision wal
k
ing d
o
cument
a
tion: docu
m
ent most
i
m
portant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
V
ajna
Codi
n
gGu
i
d
e
lines: Add a
n
ote to avoid assignments
inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos
Vajna
git-merge:
e
xclude unnecess
a
ry
opt
i
on
s
f
rom OPTIONS_S
P
EC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git
-
f
ast-
i
mpor
t
:
r
ename
cmd_*() functions to parse
_
*
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL:
add a note about GNU interactive
tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Ad
d
test
s
f
o
r sendemail
.
cc configuration va
r
iable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
git-se
n
d-ema
i
l:
a
dd
a
n
e
w s
e
n
dem
a
il
.
cc c
o
nfigurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os
V
ajna
git-
f
ormat-patch: add a new format
.
cc con
f
iguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
M
i
klo
s
V
ajna
git checkout: add -t alias
f
or
--track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
M
i
klos V
a
jna
diff opti
o
ns
d
oc
u
m
enta
t
ion
:
ref
e
r to --dif
f
-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
c
o
nt
r
i
b
/
h
ooks: add an example pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
Doc
u
mentation/hoo
k
s:
a
dd p
r
e
-
auto-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
l
os Vajna
git-gc
--au
t
o:
add pre
-
auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Va
j
na
Documentati
o
n/git-
m
erge: docume
n
t subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
gi
t
-gui:
U
pdated
H
ung
a
r
i
a
n tran
s
lation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Va
j
na
Up
d
ate Hu
n
garian translation
.
10
0
% comp
l
eted
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
o
s
Vajna
Impro
v
e t6029
t
o check the real
"
su
b
tree" ca
s
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
i
klo
s
Vajna
Documentation/git s
v
n log: add a note ab
o
u
t time
z
o
nes
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos V
a
j
na
D
ocume
n
tat
i
on/git-filter-branc
h
: add
a new msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vaj
n
a
g
it-clea
n
: handle
e
rrors if
r
emovin
g
files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Docum
e
nt
a
tion/git-stash
:
doc
u
ment opt
i
ons for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklo
s
Va
j
na
g
it clone
-s docum
e
nta
t
ion
:
force
a
new paragraph
f
o
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vaj
n
a
b
u
iltin
-
gc
.
c:
gua
r
d co
n
fi
g
p
a
rs
e
r from value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajna
git
r
e
v
-parse manpage: s
p
elling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
M
i
k
l
os Vajna
gi
t
pul
l
manpage: don't
i
nclude -n from fetch-
o
p
tions
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Mi
k
los Vajna
git-clone -s:
document
p
roble
m
s with git gc --pru
n
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
os Vajna
Include rev-list o
p
tions in git-l
o
g
manp
a
ge
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos V
a
jn
a
ls-remote: add -t and
-h optio
n
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Mik
l
o
s
V
ajna
Add using
m
e
r
ge subtree How-T
o
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
M
ik
l
o
s
Vajna
t
/
t
7001: avoid unnecess
a
ry ERE
w
hen us
i
ng grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
M
i
kl
o
s Vajna
g
i
t
-sh-setup: d
o
cum
e
n
t git_e
d
i
t
o
r() and get_
a
uthor_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
los Vaj
n
a
everyday: replace 'prune' and 'repa
c
k'
with
'
gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
iklos Vaj
n
a
U
pdate Hungarian t
r
anslation
.
100% com
p
l
ete
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
los
V
a
jn
a
Include d
i
ff options
i
n the
g
it-log man
p
a
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-em
a
i
l: ad
d
a new sendemail
.
to configuratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Mik
l
o
s
V
ajna
git
s
tash: document apply
'
s
-
-index swi
t
ch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vaj
n
a
git
-
bundle: fix com
m
an
d
line examples in
t
h
e
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
Us
e
r Manual: add a c
h
apter for
s
ubmod
u
les
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mi
k
los Vajna
Hungarian
translati
o
n of git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitweb: new cgi
parameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
l
o
s
Vajna
gitweb
:
p
r
e
fer g
i
t
_get_projec
t
_
o
w
ner() o
v
er get_
f
ile_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos V
a
jna
D
ocument -
<
n> for git-format-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree