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
Add testcase to ensure merging an early part of a branch is done properly
2008-10-14
Miklos Vaj
n
a
A
d
d
te
s
tcas
e
to e
n
sure merging an early part of
a
branch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Miklo
s
Vajna
test-lib: f
i
x
c
olor
reset in say
_
color
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vaj
n
a
t7501:
a
l
w
ays use test_cm
p
in
s
tead of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Va
j
na
Makefi
l
e
: add mer
g
e_recursive
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s
V
ajna
Makefile: e
n
able
S
NPRINTF_R
E
TURNS_BOG
U
S for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jna
F
ix '
g
it help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Va
j
na
t9300
:
replace '!' with test_must_fai
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documen
t
ation
:
do
c
ument the
p
age
r
.
*
c
onfigu
r
ation setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t7601:
e
xten
d
the 'merge
picks up the be
s
t
resu
l
t'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
los Vaj
n
a
built
i
n-merg
e
: giv
e
a
prope
r
error m
e
ssage
for
inv
a
lid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
i
klos Vajna
Teach 'git me
r
g
e
' t
h
at so
m
e
merge s
t
rat
e
gies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Vajna
A
dd a new
t
est for git-merge
-
resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new test for git-merg
e
-reso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashes: apply t
o
s
c
r
i
pts and pro
g
rams as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-b
i
s
e
ct: use
d
a
sh-less form on git bis
e
c
t
l
og
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vaj
n
a
t1007-hash
-
objec
t
.
sh: u
s
e quotes for the te
s
t des
c
ription
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0
001-init
.
sh:
change confusin
g
directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos Va
j
na
Build
i
n
m
erge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601
-
merge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree: make it usable from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
Ad
d
new tes
t
case t
o
ensure
g
it-merge prepend
s
the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-
g
it: use git init i
n
stead of git
init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg
-
to-git: rewrit
e
"git
-
frotz" to
"
git fr
o
tz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to
-
gi
t
: abort if the project dire
c
tory
is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
ik
l
os Vajna
hg-to-git: av
o
id
raisin
g
a string e
x
ception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
INSTALL: Update section
ab
o
ut git-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
R
e
t
i
r
e
'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add ne
w
test case t
o
ensure g
i
t-merge reduces octo
p
us
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jn
a
Add new
t
est to ensure git
-
me
r
ge h
a
n
d
les more
than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
I
n
troduce get_octopus_merge_bases() in com
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git
-
fmt-merge-msg:
make it usable from
other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Va
j
n
a
Move
read_cache_unmerged()
to
r
e
ad-
c
ache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
t
o ensur
e
git-merge handles pu
l
l
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move parse-
o
ptio
n
s's skip_prefix() t
o
git-compat
-
util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
M
o
v
e
commit_li
s
t_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
M
o
ve spl
i
t_cmdline(
)
to a
l
i
a
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
path-list docum
e
n
tation:
do
c
umen
t
a
ll funct
i
ons
and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
r
un-command
documenta
t
ion: fix "m
e
mse
t
()
"
paramete
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
V
a
jna
git-read
-
tree:
d
ocument -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
A
sim
p
le script to par
s
e the
results from the
t
estcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
g
i
t
-rebase -
i
: mention the short command alia
s
es in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
j
n
a
Remove unused c
o
de in par
s
e
_
co
m
m
i
t
_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
i
k
los Vaj
n
a
Strbuf d
o
cumentatio
n
: document most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklo
s
Vaj
n
a
Revision
w
al
k
ing documen
t
ation: docume
n
t
m
ost important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vajna
CodingG
u
ideline
s
: Add a no
t
e
t
o
av
o
id assign
m
ents inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-mer
g
e: excl
u
d
e
unnec
e
ssary o
p
tions
f
rom OPTIONS_SPE
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajna
git-f
a
st-import: re
n
a
m
e
cmd_*() functions to p
a
rse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajn
a
INSTALL: a
d
d a note
ab
o
u
t
GNU interactive
tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tes
t
s for sendemail
.
cc configuration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los
Vajna
git-se
n
d-email:
a
dd a new sendemail
.
c
c
configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Va
j
n
a
git-format-patch: ad
d
a
ne
w
fo
r
m
a
t
.
c
c
c
onfigura
t
i
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
M
i
klos
Vajna
git checkout:
a
dd
-
t al
i
a
s
for --tra
c
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
i
ff options documentation: refer
to --diff-f
i
lt
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
cont
r
ib/hooks: add an example pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
Documentation/
h
ooks: add pre-auto-gc
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
git-gc --auto: add pre-
a
uto-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s V
a
jna
Document
a
tion/git-me
r
ge:
d
ocument
s
ubtre
e
st
r
ategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Upd
a
ted Hungarian trans
l
ation (
e
5fba
1
8)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
U
p
date Hun
g
arian t
r
anslation
.
100% compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
Mikl
o
s Vajna
I
m
pro
v
e t60
2
9
to chec
k
the real
"
subtr
e
e" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
D
ocumentation/git
svn
l
og:
a
dd a no
t
e about ti
m
ezone
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documentation/git-f
i
lter-branch: add a
n
e
w msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
gi
t
-clean:
h
a
n
dle er
r
o
rs i
f
r
emoving fi
l
es fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s Vajna
Docum
e
ntation/git-st
a
s
h
:
docum
e
nt options
for git st
a
sh
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos V
a
jna
g
i
t clo
n
e
-
s
documentati
o
n: force a new parag
r
aph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mik
l
os Vaj
n
a
builtin-gc
.
c: guard config p
a
rser
f
rom value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
ajna
git r
e
v-pars
e
m
a
npage: spe
l
li
n
g f
i
x
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
a
j
n
a
git pull manpage: don't include -n from fetch-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clo
n
e -s: d
o
cument pro
b
lems wi
t
h
g
it g
c
--
p
rune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
In
c
l
u
de rev-l
i
st options in git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
M
i
klos Va
j
n
a
ls-remote: add -
t
and -h o
p
tions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
A
d
d using me
r
ge subtr
e
e How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
Vajna
t/t7001: avoid unnecessa
r
y ERE when using grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
M
i
kl
o
s Vaj
n
a
git-
s
h-setup:
docume
n
t
git_editor(
)
and get_auth
o
r_i
d
ent_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
los Vajna
everyd
a
y: replac
e
'prune' and 'repa
c
k'
with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Update Hunga
r
ian translation
.
100
%
c
o
mp
l
e
t
ed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vaj
n
a
Inclu
d
e diff options in the git-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos V
a
j
na
g
i
t
-send-email:
add a new
sendemail
.
to conf
i
guration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git s
t
ash: documen
t
apply's --ind
e
x swi
t
ch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
gi
t
-
b
undle: fix command
l
ine exam
p
les in t
h
e
manpa
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklo
s
Vajn
a
User Manual: add
a cha
p
te
r
fo
r
submod
u
les
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Va
j
na
Hung
a
rian t
r
anslat
i
on of
g
it-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
M
i
klos Vajna
gitwe
b
: new c
g
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:
prefe
r
git
_
ge
t
_project_owne
r
() over get_file
_
owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mikl
o
s
Vajna
Document -<n> for git-format
-
pat
c
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree