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
Merge branch 'maint' into bc/master-diff-hunk-header-fix
2008-09-10
Miklos Vajna
t7501: always use test_cmp
i
nstead
o
f diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: add merge
_
re
c
ursive
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Va
j
na
M
a
kefile: enable SNPRINTF_RETUR
N
S
_BOGUS for HP-U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
lo
s
V
a
jna
Fix 'git help help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
kl
o
s V
a
jna
t9300: repl
a
c
e
'!' wit
h
test_
m
ust_f
a
il
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
Documentati
o
n
:
doc
u
ment the pa
g
er
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklo
s
Vajna
Built
i
n git-he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
i
klos
V
a
j
na
built
i
n-help: always load_command
_
list()
in cmd_he
l
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Va
j
n
a
A
d
d a second testca
s
e
f
or handling invalid
strat
e
gies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
Add a new t
e
st for using a custom merge
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
builtin-mer
g
e:
a
l
low using a custom
s
trate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos
Vajna
b
u
iltin-help: make some interna
l
functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t7601: e
x
tend the 'merge
p
icks up the
b
est
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a proper error me
s
sage for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
each 'git merge' th
a
t
s
ome merge
strategies no long
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
Ad
d
a new test for g
i
t-me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
ikl
o
s V
a
jna
t6021: a
d
d a new test for git-merge-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
ma
k
e
re
m
ove-dash
e
s:
app
l
y to script
s
and
p
rog
r
ams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
gi
t
-b
i
sec
t
: use da
s
h-l
e
ss f
o
rm on git
b
isec
t
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t10
0
7-
h
ash-o
b
j
e
ct
.
s
h: use quotes for the test des
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
los Vajna
t
0
001-
i
nit
.
s
h
: change confu
s
ing direc
t
ory nam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Fix t
7
601-merge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
git-commit-tree: mak
e
it usable from
o
ther builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os
V
ajna
A
dd ne
w
t
est case to ensure git-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-gi
t
: use
git init instead of git
i
nit-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s V
a
jna
h
g-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
na
hg-to-git: abort if
t
he pr
o
je
c
t dir
e
cto
r
y is
n
o
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-to-gi
t
: avoid ra
i
sing a string e
x
ception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos V
a
jna
INSTALL: Update section a
b
out git-
f
rot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajn
a
Ret
i
re 'stupid'
merge st
r
ateg
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add
n
ew te
s
t ca
s
e to
ensure git-merge re
d
u
ces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Ad
d
new t
e
s
t to ensure gi
t
-
m
erge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
Introduc
e
get_o
c
topus
_
m
e
rge_base
s
(
)
in
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
git-fmt
-
merge-msg: make it us
a
ble
f
r
o
m ot
h
er bui
l
ti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move read_ca
c
he_unmerged() to
r
e
ad-cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Add n
e
w
test to ensu
r
e git-me
r
ge handles pull
.
two
h
ead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
na
Mo
v
e parse-options's
s
k
ip_pref
i
x() to git-compat-uti
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move
c
omm
i
t_li
s
t_count(
)
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move s
p
lit_c
m
dlin
e
(
)
to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s V
a
jna
path-li
s
t documentati
o
n:
d
ocumen
t
a
l
l functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os Vajna
r
u
n-c
o
mmand documentation:
fix "
m
emset(
)
" par
a
meter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mikl
o
s
Vajna
git-re
a
d-t
r
ee
:
document
-
v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A sim
p
le script to parse
the re
s
ults f
r
om
t
h
e
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
git
-
r
e
base -i:
mention the short command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused
c
o
d
e in parse_commit_buffe
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
Vajna
S
tr
b
uf d
o
c
umentation: document mo
s
t
f
unctio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vaj
n
a
Re
v
i
sion walking
document
a
tion: documen
t
most
importan
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
os Vajna
Co
d
ingGuidelines: Ad
d
a note to
a
vo
i
d
a
ssignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mikl
o
s Vaj
n
a
g
it-
m
erge: exclude
unnece
s
sar
y
opti
o
ns from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
kl
o
s Vajn
a
git-fas
t
-i
m
por
t
: rena
m
e cm
d
_
*
()
f
un
c
tio
n
s to parse
_
*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vaj
n
a
INSTALL
:
add a note about GNU
i
n
teractive tool
s
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
Add tests
for
sendemail
.
c
c
c
onfiguration
v
ar
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Va
j
na
git-se
n
d-em
a
i
l: add a new
sendemail
.
cc configuratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
V
ajna
git-
f
o
r
m
a
t-patch: add a n
e
w for
m
a
t
.
c
c configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git
c
h
eckout: add -t
alias
f
or -
-
t
ra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
lo
s
Va
j
na
diff options documentation: refer
t
o --diff-filte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
contrib/
h
oo
k
s: add a
n
example pre
-
aut
o
-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajn
a
Documen
t
ation/hooks: add pre-aut
o
-
gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
ikl
o
s
V
a
jn
a
git-
g
c -
-
auto: ad
d
p
r
e-
a
uto-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Va
j
na
D
ocumentation/git-merg
e
: doc
u
ment subtree strateg
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
V
ajna
git-
g
ui: Updat
e
d
H
ungarian tran
s
la
t
ion (e5fba1
8
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
M
iklos Vajna
Update Hu
n
gari
a
n
t
rans
l
a
tion
.
10
0
% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
V
ajna
I
m
prove
t
6
029 to check the rea
l
"subtre
e
" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Documentation/git s
v
n log
:
a
dd a note about timezo
n
es
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos
Vajna
Documentation/git-filt
e
r-bran
c
h:
add a
new msg-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
os Vajn
a
git
-
cl
e
an: handle errors if removing file
s
fail
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
los Vajna
D
ocumentat
i
on/git-
s
tas
h
: document opti
o
ns for
g
it stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s documentation: force a n
e
w
paragraph fo
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklos Vajna
builtin-gc
.
c: gua
r
d conf
i
g
parser from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mi
k
los Va
j
na
git
r
ev-par
s
e
manpage:
s
p
elli
n
g fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajn
a
git pull man
p
a
ge: don'
t
incl
u
de -n from
fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
V
ajna
g
i
t-clone -
s
: document p
r
o
b
lems with git gc -
-
pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
os
Vajna
I
ncl
u
de rev-
l
i
s
t
o
pt
i
ons in git-lo
g
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote:
a
d
d
-t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mik
l
os
Vajn
a
Add us
i
ng merge su
b
tree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
iklos Va
j
na
t/t700
1
:
avoid unnecessary
E
RE when
u
sing grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-setu
p
: document git_editor() and get_author_
i
dent_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos
V
ajna
everyday
:
r
eplace 'prune' a
n
d
'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Va
j
na
Update Hu
n
garian translatio
n
.
100%
c
o
m
pl
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos V
a
j
n
a
Include diff options i
n
the git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mi
k
los Vajna
g
it-send-email
:
add a
n
ew sendemail
.
to c
o
nfigu
r
atio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos Vajna
git stash: document apply'
s
--index sw
i
tch
commit
|
commitdiff
|
tree
2007-09-29
M
iklos Vaj
n
a
git-bundle: fi
x
commandli
n
e examples in
t
he manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
s
er Manual: add a ch
a
p
t
e
r
for submodul
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklo
s
Vajna
Hungarian translation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os
Vajna
gitweb: ne
w
cgi
p
a
r
ameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vajna
gitweb: prefer git_g
e
t_pro
j
ect_own
e
r
() ove
r
get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Document -<n>
f
or git-fo
r
mat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree