repo.or.cz
/
git
/
git-bigfiles.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: introduce merge_options
2008-08-31
Miklos
V
a
jna
merge-recursive: introd
u
ce
m
erge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Split
out merge_recursi
v
e()
t
o merge
-
re
c
ursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Make
f
i
l
e: enable SNPRINTF
_
R
ETU
R
NS_BOGU
S
for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vaj
n
a
Fi
x
'git help he
l
p'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vaj
n
a
t
9
300
:
replace '!' w
i
th test
_
must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s Vajna
Document
a
tion: docu
m
ent th
e
pager
.
*
c
o
nfiguratio
n
setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s Vajna
B
ui
l
tin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Mi
k
lo
s
Vajna
b
uilti
n
-help
:
alway
s
l
o
ad_command_list() in c
m
d_h
e
l
p()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
Add a second t
e
stcase fo
r
ha
n
d
li
n
g
invalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a new test for using a cust
o
m merge strat
e
gy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
b
uil
t
in-merge:
allow u
s
in
g
a custom
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
bui
l
tin-he
l
p:
m
ake some inter
n
al fun
c
tions
available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos Vajna
t76
0
1
: e
x
tend t
h
e 'merge picks up
t
he best resul
t
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vajna
built
i
n
-m
e
r
ge: give a proper error message for inv
a
l
id
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'g
i
t merge' that s
o
me merge strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
Add a new test
f
o
r
g
i
t-merge
-
re
s
olv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos
Vajna
t6021
:
add a new
t
est for git-merge-
r
eso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
V
ajna
mak
e
remove-dashes: ap
p
ly
t
o
scripts and progr
a
ms
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
ik
l
os Vajna
git-bisect: use dash-less
f
orm on gi
t
bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007
-
hash-ob
j
ect
.
sh: use quo
t
es f
o
r the
t
est description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0
0
0
1
-in
i
t
.
sh
:
change confusing
directory na
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Va
j
n
a
Buil
d
in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
F
i
x t7601-merge-
p
ull
-
config
.
s
h on A
I
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-
c
ommit-t
r
e
e: ma
k
e
it usa
b
le from other builti
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
Add ne
w
t
est cas
e
to ensure git-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
ikl
o
s Vajna
hg-
t
o-git: use git init i
n
stea
d
of git
i
n
it-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g
-t
o
-git: rewrite "g
i
t-frotz"
to "git frot
z
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-
t
o-git: abort
i
f
the pr
o
j
e
c
t
d
irectory
is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-t
o
-git: avoid raising a s
t
ring exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
INSTA
L
L:
Update section about git-frotz for
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
R
e
tire 'stupi
d
'
mer
g
e s
t
rategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test case to ensure
g
it-merge reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Va
j
na
Add new tes
t
to e
n
sure gi
t
-merge
h
a
n
dle
s
more tha
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Introduce get_octopus_merge_bases()
i
n
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklo
s
Vaj
n
a
git-fmt-merge-msg: make it
u
sable from oth
e
r bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move read_ca
c
he
_
u
n
merged() to
r
ead-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new tes
t
to ensure git-merge han
d
les pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move pa
r
se-option
s
's
s
ki
p
_p
r
e
fix() to
g
i
t-c
o
m
pa
t
-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Mov
e
c
o
mmit
_
lis
t
_count
(
) t
o
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move split_cmdline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list docume
n
tation
:
document
all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os
Vajna
run-command
documen
t
ation:
f
ix "memset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vaj
n
a
git
-
read-tree
:
docum
e
nt
-
v optio
n
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
A simple scr
i
pt to pa
r
s
e
the results from
the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
g
it-rebase
-
i: menti
o
n the
s
hort command aliases
i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
Remove u
n
used cod
e
in pars
e
_co
m
mit_
b
uffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Mik
l
os Vajna
Str
b
uf documentation:
d
ocument
mo
s
t
fu
n
ctions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklo
s
Vajna
R
e
vision walking documenta
t
ion:
d
o
cument most i
m
p
o
rtant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los Va
j
na
CodingGuidelines:
Add a note to av
o
i
d assignments ins
i
de
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
os Vajna
git-merge: exclude unnecessary optio
n
s
from
O
PTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
V
aj
n
a
git-fast-import: ren
a
me cmd_*(
)
functio
n
s to p
a
rse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vaj
n
a
IN
S
TALL: add a note about GNU
i
nteracti
v
e too
l
s
h
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add
t
est
s
for sendemail
.
cc configurat
i
on va
r
iabl
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vajna
git-
s
end-ema
i
l
:
add a ne
w
sen
d
email
.
cc co
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
j
na
g
i
t
-format
-
p
atch: add a
new for
m
at
.
c
c
configur
a
tion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Mi
k
los
V
ajna
git checkou
t
: add -t
a
lias
for --t
r
ack
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
M
iklos Vajna
diff o
p
tions do
c
umentat
i
on:
refer to --diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
l
o
s
V
ajna
co
n
trib/h
o
oks
:
add
an example
pr
e
-
auto-gc
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
V
a
jn
a
Do
c
u
m
entation
/
h
o
ok
s
: ad
d
p
r
e
-a
u
t
o
-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
los Vajna
git-gc --au
t
o
:
add pre-auto-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos Vajna
Document
a
tion/git-merge: document
s
ubtree str
a
tegy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vaj
n
a
git-gui: Updat
e
d Hungarian translati
o
n (e5f
b
a
1
8
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
ik
l
o
s Vajna
U
p
da
t
e Hun
g
arian
t
r
anslation
.
100%
c
omp
l
eted
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
l
os Vajna
Improve t6029 to check the
r
eal "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos Vaj
n
a
D
oc
u
mentat
i
on/git
s
vn log: add a note
a
b
out tim
e
z
o
nes
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
V
a
jna
Documentation/g
i
t-filte
r
-branch: add a ne
w
msg-filte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklo
s
Vajna
g
i
t-clean: handl
e
errors if removing files f
a
i
ls
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Documentat
i
o
n
/git
-
stash: docum
e
nt option
s
f
or g
i
t stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git
c
l
one -s do
c
um
e
ntation: force a new
paragraph
for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos V
a
jna
b
u
i
ltin-gc
.
c:
g
u
ard config parser f
r
om v
a
lue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos Vajna
gi
t
rev-parse
m
anpage: spelli
n
g fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manp
a
g
e
: don't inclu
d
e
-
n
fro
m
fe
t
c
h-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
Vajna
git-clone -s: docum
e
nt problems wit
h
git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los
Vajna
Includ
e
rev-l
i
st opt
i
ons in git-log
m
anpag
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os Vajna
ls-r
e
mo
t
e: add -t and -h o
p
tions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Mikl
o
s
V
ajna
Add using m
e
rge sub
t
ree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
M
i
k
l
os Vaj
n
a
t/t7001:
avoid unnecessary ERE when u
s
ing grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos V
a
j
n
a
g
it-
s
h-s
e
tup: docum
e
nt git_editor() and get_autho
r
_ident_
f
ro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vajn
a
everyday: replace 'prune' and 're
p
ack'
with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
ik
l
os Vajna
Update
Hungarian tr
a
n
s
lation
.
100% complet
e
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Include d
i
f
f
op
t
ions in
t
he git-log
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Mik
l
os Vajn
a
git-send-emai
l
: ad
d
a
new sendemail
.
to configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s
V
a
j
na
git stash: document apply's --index s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
Miklo
s
Vajna
git-bundle:
fix
c
ommand
l
ine e
x
ampl
e
s in
th
e
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajn
a
User Manual:
a
dd a chapter for submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
V
aj
n
a
Hungari
a
n translation of git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
los Vajna
gitweb: new
cg
i
par
a
met
e
r: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
Vajna
gitweb: pref
e
r git_get_project_owner() over g
e
t_file_owne
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
Va
j
na
Doc
u
men
t
-<n> for git-format-p
a
tch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree