repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: get rid of the index_only global variable
2008-09-05
Mi
k
lo
s
Vajn
a
m
erg
e
-recursive: g
e
t
rid of the index
_
only
global
v
ariable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Va
j
na
merge-recursive: move ca
l
l_depth to st
r
uct merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajn
a
cherry-pick/rev
e
rt: make direc
t
i
n
ternal
call to
m
e
rge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
builtin-m
e
rge: avoid r
u
n_command_v_o
p
t()
f
or
r
ecu
r
siv
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Va
j
na
merge-recursive: introduce merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
S
p
lit out merge_recur
s
ive(
)
to merge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enab
l
e
SNPRINTF_RETU
R
N
S_
B
O
G
US
for HP
-
UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git help h
e
lp'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: re
p
l
ace
'
!
'
with te
s
t_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s Vajn
a
Docu
m
en
t
a
t
ion: document
the pager
.
*
configur
a
tion
s
e
t
ting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vajna
Builtin gi
t
-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos V
a
j
na
bu
i
ltin-
h
elp:
a
l
w
ays loa
d
_command_list() in cmd
_
help
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
Add
a
second testcase for handling in
v
alid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a
n
ew t
e
st for using
a
c
ustom merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
a
jna
builtin-
m
erg
e
: allow using a c
u
st
o
m stra
t
egy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
builtin-help: make some interna
l
f
unction
s
available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend
t
he 'm
e
rge
p
i
cks up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
bu
i
ltin-merge: g
i
ve a pr
o
per error message for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
e
a
ch 'git me
r
ge'
that some mer
g
e strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos V
a
jna
Ad
d
a new tes
t
f
or gi
t
-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021:
add a
new test
f
or git-m
e
rge-resol
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashes: a
p
ply to scripts and programs
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-bisect: us
e
dash-less form on
g
it bisect l
o
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t1
0
07-h
a
sh-object
.
s
h
: use quot
e
s for the test descriptio
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t00
0
1-i
n
it
.
sh
:
change confusing directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos Va
j
na
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
F
i
x t7
6
01-
m
e
rge-pull-co
n
fi
g
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
git-co
m
m
i
t-
t
ree
:
make it usable from other
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
Add
new test case to en
s
ure gi
t
-mer
g
e prepen
d
s
t
he
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s V
a
jna
hg-t
o
-git
:
use git in
i
t instead of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-to-git
:
rewrite "git-frotz" to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
h
g-to-git: abort
i
f the p
r
o
j
ect dir
e
ctory
i
s
not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-g
i
t: av
o
id
r
a
isin
g
a stri
n
g exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
I
N
STALL
:
Update section about gi
t
-f
r
otz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Va
j
na
Retire
'
s
t
u
pid'
merge strat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new
t
e
s
t case
t
o en
s
ure git-me
r
ge reduces
octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Vajna
A
d
d new te
s
t
t
o ensure
g
it
-
m
erge hand
l
es more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
os Vajna
Introduce get_oc
t
opu
s
_merge_bases
(
)
in
c
ommit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-f
m
t-merge-msg: mak
e
i
t
usable
f
r
o
m other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
Move read_cache_unmer
g
ed() to rea
d
-ca
c
he
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajn
a
Ad
d
new test t
o
e
nsure
g
it-merge handles p
u
ll
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move pa
r
se-options's skip_prefix
(
) to git-compat-uti
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove commit_list_count() to co
m
mit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ov
e
spli
t
_cmdline
(
)
to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
path-list docu
m
entation: document all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Va
j
na
run-command
documentat
i
o
n
: fix "mem
s
et()" p
a
rameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos V
a
j
n
a
git-read-t
r
ee
:
document -v
o
p
tion
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vaj
n
a
A si
m
ple script to pars
e
the r
e
su
l
ts from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase -i: mention t
h
e s
h
ort com
m
and aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove
unused co
d
e
in pars
e
_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf docum
e
ntation: d
o
cum
e
nt most fu
n
ctions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision
wa
l
king docume
n
t
a
tion: document mo
s
t
im
p
ortant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajn
a
CodingGuideli
n
es: Add a note
to avoid assignment
s
inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos V
a
j
na
git-me
r
ge: exclude unne
c
e
s
sar
y
opti
o
n
s
f
rom OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
g
it-
f
ast-i
m
p
ort: rename c
m
d_*
(
) functions
t
o parse_*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
ajna
INSTALL: a
d
d a note about GNU intera
c
tive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
A
dd tes
t
s
f
or send
e
mail
.
cc config
u
ration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajn
a
git-sen
d
-ema
i
l: add a new s
e
ndem
a
il
.
c
c co
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajn
a
git
-
form
a
t-p
a
tch:
add
a
new format
.
c
c
configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
Vajna
g
it checkout: a
d
d -t
a
li
a
s f
o
r --
t
rack
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
Vajna
diff options doc
u
ment
a
tion: r
e
fer to --diff
-
filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos
V
a
j
n
a
cont
r
ib/hook
s
:
a
dd an
example
p
re-auto
-
gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Docum
e
ntatio
n
/ho
o
ks:
a
dd
pre-au
t
o
-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
git-gc --auto: add pre-
a
uto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
V
ajna
Docume
n
t
a
tion/git-merge: docume
n
t subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
o
s Vajna
git-gu
i
: Updated Hungari
a
n tr
a
nslation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
os Vajna
Update Hungarian translation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
mprove t6029 t
o
check the re
a
l
"
subtree
"
c
a
se
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Docum
e
nta
t
ion/g
i
t svn
l
og: add
a
n
o
te abou
t
timezon
e
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Docum
e
ntation/git-filter-branc
h
: add
a
new ms
g
-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: ha
n
dl
e
erro
r
s if
rem
o
ving fi
l
es
fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklo
s
V
a
jna
D
ocumentation/git-stash
:
document
o
p
t
ions for gi
t
stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git cl
o
ne -s docu
m
entation: force a
n
e
w paragr
a
ph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos V
a
jna
b
uilti
n
-gc
.
c:
g
uard conf
i
g
parse
r
from v
a
l
ue=N
U
L
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
Vajna
g
i
t
rev-
p
arse manpage: s
p
ell
i
ng fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklo
s
Vajna
git pull manpage
:
don'
t
inc
l
ude -n f
r
om fetch-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
ajna
git-clone -s: document problems with
g
i
t
gc --pr
u
ne
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Include rev-list opti
o
ns in g
i
t-lo
g
manp
a
ge
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: a
d
d -t and
-
h
opti
o
n
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
ik
l
os Vajna
A
dd using m
e
rge s
u
btree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklo
s
Va
j
na
t/t7001:
a
void
u
nnecessary ERE when us
i
ng grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos
V
ajna
git-sh
-
setup: document git_
e
dito
r
() and ge
t
_autho
r
_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mikl
o
s Vajna
everyd
a
y: replace 'pru
n
e' and
'
repack'
w
ith 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Update Hungarian translation
.
100% comp
l
eted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vajna
Inc
l
ude d
i
ff
op
t
io
n
s in the git-l
o
g manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos Vajna
git-
s
en
d
-email: add
a
n
e
w
sendemai
l
.
to configurat
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klo
s
Vajna
git stash
:
d
ocu
m
ent
apply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos
V
a
jna
git-bundl
e
: fix commandline e
x
am
p
les in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s Vajna
User Manual
:
add a cha
p
t
er for
s
ubmodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian translation
o
f
g
it-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitwe
b
: new cgi parameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
V
ajna
gitw
e
b: prefer
gi
t
_
g
et_proje
c
t_owner
(
)
o
ver get_file_o
w
ner
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
i
klos
V
ajna
Documen
t
-<n>
for git
-
format-pat
c
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree