repo.or.cz
/
git
/
jnareb-git.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
M
i
klos Vajna
Add testcas
e
to ensur
e
m
erging an ear
l
y p
a
r
t
of
a bra
n
ch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Miklo
s
Vajn
a
test-lib: fix color r
e
set in say
_
color()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
t
7501: alway
s
use
test_cmp
i
nstead of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
los Vajn
a
Makefile: a
d
d
m
erge_rec
u
rsive
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
M
i
kl
o
s Vajna
Make
f
ile: enable SNPRINTF_RETUR
N
S_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklo
s
V
a
j
na
Fix 'git
h
elp he
l
p'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
lo
s
Vajna
t9300: re
p
lace '!' with t
e
st_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos
V
ajna
Docume
n
tation
:
doc
u
ment the pa
g
er
.
* configuration setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajn
a
t7
6
01: extend the 'merge p
i
c
k
s up the b
e
st result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Vajna
builtin-merge: give a proper
error message for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos V
a
jna
Teach 'git me
r
ge' that some merge strategies
n
o long
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
A
d
d a new test for
g
it
-
mer
g
e-
r
esolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajna
t6021:
add a new t
e
st
for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make remo
v
e-dashes: apply to scripts
a
nd progra
m
s as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: u
s
e d
a
sh-less
for
m
o
n git bis
e
ct log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vaj
n
a
t
1
0
0
7
-hash-ob
j
e
c
t
.
sh: use
quot
e
s for the
test desc
r
iption
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t000
1
-init
.
sh: change confusin
g
di
r
ector
y
name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
ld in me
r
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Fix
t
7601-merge-pull-con
f
ig
.
s
h
on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
aj
n
a
git-commit-tree:
m
a
k
e i
t
usable f
r
om other
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Add new tes
t
case to ensure
git-merge pr
e
pend
s
th
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: us
e
git init instead of git init-d
b
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Va
j
na
hg-t
o
-
git:
r
ewrite "g
i
t
-frotz" to
"git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-git: abort if t
h
e p
r
oject
directory is
n
ot a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
ajna
hg-to-git: av
o
id raising a
str
i
ng exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
INSTALL: U
p
date sect
i
o
n
ab
o
u
t
git-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
k
los Vajna
Retire
'
stupid'
merge stra
t
egy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test case
t
o
e
nsure
g
it-merge reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new test to e
n
s
u
r
e
g
i
t-m
e
rge handl
e
s mor
e
t
h
a
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
I
n
tro
d
uce get_octopus_
m
erge_bases() in c
o
m
mit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-fmt-me
r
ge-msg:
m
ake i
t
usab
l
e from other
b
uiltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move read_cache_unmerged() to read-cac
h
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajn
a
Add new test to ens
u
r
e
gi
t
-
merge ha
n
dles
p
ull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
os Vajn
a
Move parse-options's s
k
ip_prefix() to
g
i
t-compat-ut
i
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move
c
ommit_lis
t
_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
Move split_
c
mdli
n
e() t
o
alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list documentation:
d
o
c
ument all
func
t
ions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documen
t
ation: fix "memset()" para
m
eter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read
-
t
re
e
: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
A
simpl
e
scrip
t
to parse the results from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s
Vajna
git-rebase -i: men
t
io
n
the
s
ho
r
t com
m
and ali
a
ses i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
Re
m
ove unused
c
ode in parse_
c
ommit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajna
S
t
r
b
uf documentation: document
mo
s
t funct
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Va
j
na
Rev
i
sion
w
alk
i
ng documentation: d
o
cum
e
nt mos
t
imp
o
rtant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
M
iklos Vajna
C
odi
n
gGu
i
delines: Add a no
t
e to avoid assignments in
s
i
d
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
gi
t
-merge: exclude unneces
s
ary options from O
P
TIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Va
j
na
git-fast-import: rename cm
d
_*() functions to parse_*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklo
s
Vajna
INS
T
ALL: a
d
d a no
t
e
about GNU interactive to
o
ls has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tes
t
s
f
or sendema
i
l
.
cc c
o
nf
i
gur
a
tion
v
aria
b
le
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
git
-
s
e
nd-email
:
add a new sendemail
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s
Vajna
g
it-format-patch: add a new format
.
cc co
n
figuratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
M
i
klos Vajna
git checkout: add
-
t ali
a
s
for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
los
Vajn
a
d
iff options doc
u
m
e
ntation:
refer to --
d
iff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
ontrib/hooks: a
d
d
an example pre
-
auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentati
o
n/hooks: add pre-auto-gc
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klo
s
Vajna
gi
t
-
g
c
--auto: add pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Docume
n
tation/
g
it-merge: doc
u
ment subtr
e
e strate
g
y
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
V
ajna
git-gui: U
p
dated Hu
n
garian translation (e
5
f
b
a18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
i
klos Vaj
n
a
Updat
e
Hungarian translation
.
100%
comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
M
iklo
s
V
ajn
a
Impr
o
ve
t
6
0
29 to check th
e
real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Do
c
umentat
i
on/git svn l
o
g: add a note about timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
D
ocume
n
tation/g
i
t
-
filte
r
-branch
:
add a
n
ew msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-cle
a
n
: han
d
le errors if remov
i
ng
file
s
fai
l
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklo
s
Vajna
Documentation/
g
i
t
-stash: document options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Va
j
na
git clone -s doc
u
mentation: force a new par
a
graph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
M
ik
l
os Va
j
na
builtin-
g
c
.
c: guard config p
a
r
se
r
f
r
o
m value=
N
U
L
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
i
klos Vajna
git rev-parse manpage:
spelling
fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajn
a
git
p
ul
l
m
anpage: don't in
c
lud
e
-n from fet
c
h-optio
n
s
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajn
a
git-clo
n
e
-s:
d
ocument problems with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Inc
l
ude re
v
-
l
ist options
i
n git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: add -t a
n
d -h op
t
ions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
i
klo
s
Vajna
Ad
d
using merge s
u
btree How-
T
o
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001:
a
v
oid
u
nnecessary ERE w
h
en using grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klos
V
a
j
na
git-sh-setup: do
c
ument git_editor() an
d
get_
a
uth
o
r
_
i
de
n
t
_
f
r
o
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
lo
s
Vaj
n
a
everyda
y
: replace 'p
r
une' an
d
'rep
a
ck' w
i
th '
g
c'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update H
u
ngari
a
n t
r
ansla
t
ion
.
1
0
0% comple
t
ed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vaj
n
a
I
n
cl
u
de diff
o
p
t
i
o
ns in the
g
i
t-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajn
a
g
i
t-
s
e
n
d-email: add a
new sen
d
e
m
a
il
.
to c
o
nfigu
r
ation
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklo
s
V
ajna
git stash: document
apply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Mik
l
os Vajna
git-
b
undle: fix commandline exampl
e
s in the manpa
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mi
k
l
os Vajna
User
M
a
n
u
al
:
ad
d
a chapte
r
for subm
o
dules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungar
i
an translation o
f
gi
t
-gu
i
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajn
a
gitwe
b
: new cgi paramete
r
:
o
p
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vaj
n
a
gi
t
web: prefer git_
g
e
t
_p
r
oject_owner() over g
e
t_file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vaj
n
a
Doc
u
ment -<n
>
for
git-format-pat
c
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree