repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Change xdl_merge to generate output even for null merges
2008-12-20
Miklos Vajna
Submi
t
tingPatches: mention
the usag
e
o
f re
a
l name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos V
a
jna
h
t
tp
.
c: use 'git_config_
s
t
ring'
to get
'
curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os
Vajna
U
ser's Manu
a
l: remove duplicated url at
t
he end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mi
k
los
Vajna
Add new
t
e
s
tcase to sh
o
w
fa
s
t-expo
r
t does no
t
always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
up
d
ate-ref --no-d
e
ref -d: handle
t
he case
when
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
g
i
t branch
-
m
:
forbid
re
n
ami
n
g
of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fi
x
gi
t
update-
r
ef --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajn
a
re
n
a
m
e_ref(): handle
t
he
c
as
e
when the r
e
flo
g
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
Fix g
i
t branch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
d
d
testcase to ensure mer
g
i
n
g an early par
t
of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib:
f
ix color
r
eset
i
n
s
a
y
_c
o
lo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
l
o
s Vajn
a
t7501: a
l
ways
u
se test_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klo
s
Vajna
Makefile:
ad
d
merge_recursiv
e
.
h to LI
B
_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefi
l
e: enabl
e
SNPRINT
F
_RETURNS_BOGU
S
for H
P
-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mikl
o
s Vajna
Fi
x
'
g
it
help hel
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t
9
300: replace '!' with
test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s Vajna
Documentation: document th
e
pager
.
* config
u
ration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: exte
n
d
the '
m
erge p
i
c
k
s up the bes
t
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mik
l
o
s Vajna
builtin-merge: give a prope
r
er
r
o
r message f
o
r invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Teach 'git mer
g
e'
t
hat some merge strategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
Add
a
new test
f
or git-merge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os
Vajna
t6021: add a new
test
f
or git-merge-reso
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
m
a
ke remove-d
a
s
hes: appl
y
to
script
s
and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use
dash-less
form on
g
it bis
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-
h
ash-object
.
sh: u
s
e q
u
otes for the test descript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t0001-in
i
t
.
sh: change confusing directo
r
y na
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklo
s
Vaj
n
a
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
Fi
x
t7
6
01-mer
g
e-p
u
l
l-con
f
ig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
V
a
jna
git-commit-tree:
m
ake
it usable
f
r
om
oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Add new test case to
e
n
s
ure
g
it-merge pr
e
pends th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git: use git ini
t
instead of
g
it ini
t
-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to
-
gi
t
: rewrit
e
"git-
f
ro
t
z" to "git frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-git: abort if the project direct
o
ry
i
s 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 string exc
e
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
INSTA
L
L
: Upda
t
e section about g
i
t-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire
'
stupid' mer
g
e strategy
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Va
j
na
Ad
d
n
ew test ca
s
e to ensure git-merge reduces octop
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
A
d
d new t
e
st to e
n
sure git-merge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los V
a
j
n
a
I
n
troduce
g
et
_
octopus_m
e
r
g
e_
b
ases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt
-
mer
g
e-msg: make it usable from o
t
her builti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
read_cache_un
m
erged()
t
o read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add new test to e
n
sure git-merge handles p
u
ll
.
tw
o
head
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move p
a
rse-o
p
tions's skip_
p
r
e
fi
x
(
) to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move commit_li
s
t_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmd
l
ine() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los V
a
jna
path-list doc
u
mentation: document all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-comma
n
d
d
ocument
a
tion:
f
i
x
"mems
e
t()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
ajna
git-read-tre
e
: doc
u
ment
-v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A
simple script
to parse the r
e
sul
t
s from t
h
e
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-re
b
ase -i: mention the short command
a
liases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
R
emove unused
c
o
de in p
a
rse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Mi
k
los Vajn
a
Strbuf document
a
t
i
on
:
document mo
s
t
funct
i
on
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
Revision
w
a
lki
n
g documentation:
d
ocument
m
o
s
t important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vajna
CodingGuid
e
line
s
: Ad
d
a
note to avoid assignm
e
nts i
n
si
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
Vajna
git-merg
e
: ex
c
lude
u
n
n
ece
s
s
ary o
p
tions from OPT
I
ONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklo
s
Va
j
na
gi
t
-fast-
i
mport
:
ren
a
m
e
cmd
_
*() functions
to p
a
rse_*(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: ad
d
a note
a
bout GNU interact
i
ve
tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
los Vaj
n
a
Add
t
es
t
s for sen
d
email
.
cc co
n
figurat
i
on variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
j
n
a
git-send-em
a
il:
a
dd a
n
ew sendemai
l
.
cc configur
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
git
-
format-pa
t
c
h
: add a new format
.
cc conf
i
guratio
n
.
.
.
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
Mikl
o
s Va
j
n
a
d
i
f
f option
s
docum
e
n
t
ation: r
e
f
er to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/
h
ooks:
add a
n
e
xample p
r
e-auto-g
c
ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/hooks
:
add
p
re
-
au
t
o-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc
--auto: add
p
re-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
i
k
l
os Vajna
Docum
e
ntatio
n
/git-mer
g
e
: doc
u
m
e
n
t subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gu
i
:
Updated Hung
a
rian translation (e5
f
ba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
os
Vajna
Update Hunga
r
ian
t
ranslation
.
100%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
mprove t6029 to check
t
he
r
eal "subtre
e
" c
a
se
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos Vajna
Doc
u
ment
a
tion/g
i
t svn
log: ad
d
a n
o
te abou
t
timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
D
ocument
a
tion
/
g
i
t-filt
e
r-branch: add a n
e
w msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
l
os Vajna
git-clean: handle errors if removing files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Documentation/gi
t
-stash: document options
f
or git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mi
k
l
o
s
Vajna
git
c
lon
e
-
s
documentati
o
n: for
c
e a n
e
w pa
r
agraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builti
n
-gc
.
c
: guard co
n
f
i
g parser from
v
alue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
ik
l
os
V
a
jna
git
r
ev-parse manpage: spelling
f
ix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
g
i
t
pull
m
a
np
a
g
e
:
don't i
n
clude
-n fro
m
f
etch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mi
k
los Vajna
git-clone -s
:
d
ocument
problems with git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los
Vajna
Include rev-list opti
o
ns in git
-
log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
Vajn
a
l
s
-re
m
o
t
e: add -t
and -h o
p
tion
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mik
l
os Vaj
n
a
Add using merge sub
t
ree Ho
w
-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001: avoid unnec
e
ssary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-s
h
-
s
etu
p
: document git_editor
(
) and
g
et_author_ident
_
fr
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklo
s
Vajna
e
veryday: repl
a
ce 'prune'
a
nd 'repack' wi
t
h
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update H
u
ngarian tra
n
slation
.
100% comp
l
eted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
I
n
clude di
f
f
o
ptions in
t
he git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Va
j
na
g
i
t-send-email: add a new sendemail
.
t
o
co
n
fig
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git
stash: document
apply'
s
--in
d
ex switch
commit
|
commitdiff
|
tree
2007-09-29
M
iklos Vajna
git-bundle:
f
i
x
c
o
m
mandline
exam
p
les
in the m
a
npage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mik
l
os Vajna
U
s
e
r
Man
u
al: ad
d
a chapt
e
r for su
b
mo
d
ules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
H
u
n
g
arian tr
a
nslation of git-g
u
i
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
lo
s
Vajna
gitwe
b
: new cg
i
pa
r
ame
t
er
:
o
pt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: pref
e
r gi
t
_
get_projec
t
_owner
(
) over get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mikl
o
s
V
a
jn
a
Docume
n
t -<n
>
for gi
t
-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree