repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/maint-diff-quiet' into maint
2008-09-10
Miklos Vajna
t7501:
a
l
w
a
ys use t
e
st_
c
mp in
s
t
ead of
d
i
ff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
l
o
s Vajna
Makefile: add merge_re
c
ursiv
e
.
h to
L
IB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makef
i
le:
e
nable SNPRINTF_
R
ETURNS_BOG
U
S
f
o
r
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vaj
n
a
Fix 'git help
h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t
9
300
:
replace '!
'
with te
s
t_mus
t
_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los Vajna
Docum
e
nt
a
tion: docum
e
nt the pager
.
* c
o
nfig
u
ra
t
ion setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajn
a
t7
6
0
1: e
x
ten
d
th
e
'
merg
e
picks
up the best
r
esul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
b
uil
t
i
n
-mer
g
e: give
a
pro
p
er
error
messag
e
for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
i
klos Vajna
Te
a
ch 'git merge' th
a
t some me
r
ge
strategies no l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajna
A
d
d a
new test
for git-
m
erge-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t602
1
:
add a
n
ew
test for git-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os
V
ajna
make
remove-dashes: apply to scripts
and pr
o
grams
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-
b
i
sect: us
e
dash-
l
ess form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t1007-ha
s
h-obje
c
t
.
sh: u
s
e quotes
for the test desc
r
ip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t0001-init
.
sh:
c
hange confusing direc
t
ory name
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
a
jna
F
ix t7601
-
merge-
p
ull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
git-commit-tr
e
e: m
a
ke it us
a
ble f
r
om other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Ad
d
n
e
w t
e
st case to ens
u
re git-mer
g
e
prepends t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
i
t:
use
g
it init instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
os V
a
j
na
hg-
t
o-git:
r
e
write "git-frotz" to "git frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg
-
to-git: abo
r
t if the p
r
o
j
ect d
i
rec
t
ory is n
o
t a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg
-
to-g
i
t: avoid raising a string ex
c
eption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
INSTALL: Update secti
o
n about g
i
t
-
frotz
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklo
s
Vajn
a
R
e
tire 'stupi
d
'
m
e
rge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vaj
n
a
Add
n
e
w test case to ensure g
i
t-m
e
rge
r
educ
e
s
o
ctopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
A
d
d
n
ew t
e
st to
e
nsure git-merge h
a
ndles
m
ore t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Vajna
Introd
u
c
e get_octopus
_
me
r
ge_bases() in c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge
-
ms
g
: m
a
ke it usable from ot
h
er
b
uiltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove read_cache_unme
r
ged() to
read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Add
n
e
w test to ensure
gi
t
-m
e
rge handles
p
ull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los V
a
jna
Mo
v
e p
a
rse-options's skip_prefix() t
o
g
i
t-compat-uti
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
Move
c
o
m
m
i
t_list_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
Va
j
na
Move s
p
l
i
t_cmdline() to al
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-lis
t
documenta
t
ion:
docu
m
en
t
a
l
l
functions
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Va
j
na
run-
c
o
mman
d
docum
e
ntation: fix
"
memset()
"
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajn
a
git
-
read-
t
ree: d
o
cument -v opt
i
o
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos
Vajn
a
A
s
i
m
ple script
to par
s
e the result
s
fr
o
m the t
e
stcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los
V
a
j
n
a
git-
r
eb
a
se -i: m
e
ntio
n
t
h
e short command al
i
ase
s
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
Remove unused code
i
n parse_co
m
mi
t
_buff
e
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajn
a
Strbuf doc
u
m
e
ntat
i
on: document most functi
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Mik
l
os Vajna
R
evision walking documentation:
document
m
ost
impo
r
tant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
os
Vaj
n
a
Co
d
ingGuidelines: Add a note
t
o avoid assignments insi
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
lo
s
Vajna
g
i
t
-merge: exclude unn
e
cess
a
r
y options from OPTIONS_SPE
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mi
k
l
os Vaj
n
a
g
i
t-fast-import: renam
e
cmd_*(
)
f
u
nc
t
ion
s
to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mi
k
los Vaj
n
a
I
N
S
TALL: add a no
t
e about GNU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
ikl
o
s Vajna
Add tests for sen
d
email
.
cc configuration
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
i
t-send-
e
m
a
il: add a new s
e
ndemail
.
cc c
o
nfig
u
ra
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajna
g
it-f
o
rmat-patch: ad
d
a new
f
ormat
.
cc conf
i
gu
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mik
l
os Vajna
git
checkou
t
: add -t alias for --t
r
ack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
los Vajna
diff
options doc
u
m
entation: re
f
er to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
contrib/hooks:
a
dd an example pre-aut
o
-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
Documentation/hooks: add pre-auto
-
g
c
h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
aj
n
a
git-g
c
-
-aut
o
:
add pre
-
auto
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mik
l
o
s
V
ajna
Documentation/git-merge
:
do
c
ument subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
iklos Vajn
a
git-gui
:
Updated Hungarian tran
s
lation
(
e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
ajna
Update Hungaria
n
tra
n
slation
.
1
0
0% co
m
plete
d
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
l
os Vajna
Improv
e
t
6029 to
check the real "
s
ubtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
na
Docum
e
nt
a
tion/git svn
l
o
g
: add a n
o
te about
timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
los Vajna
Docu
m
e
ntat
i
on/git-filter-br
a
nch: add a n
e
w
msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
M
ik
l
os Vaj
n
a
git-clean: handle e
r
rors if remo
v
ing files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vajn
a
Documentation/git-st
a
sh:
document options
f
or git s
t
ash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vajna
g
i
t clone -s documentation: force a
new paragra
p
h
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklo
s
Vajna
builtin-gc
.
c: guard conf
i
g parser
from v
a
lue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mi
k
l
os
Vajna
git rev-parse man
p
age:
spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos Va
j
n
a
gi
t
pu
l
l man
p
age: don't include -
n
from
f
etch-opt
i
on
s
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git
-
c
lon
e
-s: do
c
u
m
e
n
t problems with git gc
--pr
u
ne
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mikl
o
s Vajna
Include r
e
v-list options in
g
it-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
r
e
mote: add -t and -h opt
i
ons
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
i
k
l
os
Vajna
Add usin
g
merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
Vajna
t/t7001: avoid u
n
nece
s
sary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-s
h
-setup: document git_editor() and get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
everyday: replac
e
'p
r
une' and 'repack'
w
i
th 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
Vajna
U
p
date
Hu
n
garian translation
.
1
00% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Inclu
d
e d
i
ff options in t
h
e git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mik
l
os Vajna
g
it-send
-
email
:
add
a
n
ew sendemail
.
t
o
c
o
n
fig
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Va
j
na
g
i
t
stash
:
d
ocume
n
t apply's --index switc
h
commit
|
commitdiff
|
tree
2007-09-29
M
i
kl
o
s Vajna
gi
t
-bun
d
le:
f
i
x comman
d
line exa
m
ples
i
n
t
he manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
Vajn
a
User Manual: add a chapter
f
or
sub
m
odules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vaj
n
a
Hungar
i
an translation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
iklos Vajna
gitweb: new c
g
i para
m
eter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vaj
n
a
gitweb: prefer gi
t
_ge
t
_project_owner() ove
r
get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mikl
o
s Vajna
Docum
e
nt -
<
n> for git-form
a
t-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree