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
merge: Make 'merge.log' an integer or boolean option
2010-09-09
Ra
m
k
uma
r
Ram
a
ch
a
ndr
a
merge: Make 'merge
.
l
o
g' an integer or b
o
olean option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
R
amkumar Ramach
a
ndra
merge: Make '--log' a
n
in
t
eger option for number of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ram
k
uma
r
Ramachand
r
a
fmt_merge_msg:
C
hange fmt_merge_msg API
t
o
acc
e
pt shortlo
g
_len
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge script
:
lea
r
n --[no-]rerere-au
t
oupdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script: notic
e
@
{
-
1} shorthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Nieder
merge script: han
d
l
e
-
-no-ff --no-commit correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merg
e
scr
i
pt: --ff-only
t
o dis
a
l
l
ow t
r
u
e
m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
N
ieder
m
er
g
e script:
h
a
ndl
e
many-w
a
y octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: handle -m --log correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge scrip
t
: forbid
merge -s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan N
i
eder
merge script: allow custom st
r
ategie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
me
r
ge script: merge
-X<o
p
tion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e sc
r
ipt: improv
e
l
og m
e
ssa
g
e subj
e
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge script:
r
efuse t
o
merge du
r
i
n
g
m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge s
c
ript: twe
a
k
unmerged fi
l
es message to
match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n Niede
r
m
erg
e
script: -
-
squa
s
h, --ff from unborn branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
i
e
d
er
fmt-m
e
rge-msg
-
m
t
o overri
d
e merge titl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Ni
e
der
m
erge-base --ind
e
penden
t
to
print
r
educed
p
arent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
m
e
rge-base --octopus to mimic s
h
o
w
-br
a
nch --merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
han Nieder
Documentation: ad
d
a SEE
A
LSO
s
ec
t
io
n
for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n Nie
d
er
t6200
(
fmt-merg
e
-msg):
styl
e
nitpi
c
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
th
a
n N
i
eder
t6
0
10 (merge-b
a
se): modern
i
ze style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
t7
6
00 (mer
g
e)
:
tes
t
m
er
g
e
f
rom branch
y
et to b
e
born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t
7600 (m
e
rge)
:
check
r
e
flog
en
t
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
i
eder
t
7
600 (merge): do not launch
gitk
for -
-
debu
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (me
r
ge
)
: moder
n
ize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge: do not m
i
stake
(
a
n
cestor of) t
a
g
fo
r
branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
Ha
m
a
no
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C H
a
mano
te
s
ts:
c
orr
e
ct "do
e
s ref
l
o
g
exi
s
t
?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t
/: wor
k
around one-sho
t
variable assignm
e
nt
w
ith te
s
t_must_fa
i
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t
/
README: corr
e
ct
a
n except
i
on when
b
r
e
a
k
in
g
a
&& chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Cas
e
y
t/
{
t5541,l
i
b-httpd
}
: replace proble
m
atic '!()'
n
otation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon Casey
t
/
t3700: conver
t
two uses of
negation opera
t
o
r '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
Casey
t/R
E
ADME: clarify test_must_fail des
c
r
i
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
G
r
e
g
Br
o
ck
m
an
C
heck siz
e
of
pa
t
h
b
u
f
f
er before writing
i
nto
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf T
h
ielow
update-server-info: Short
e
n rea
d
_pack_
i
n
f
o_file
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
Arnfjörð
B
jarm
a
son
gi
t
a
d
d: A
d
d -
-
ignore-missing to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjö
r
ð Bj
a
rmason
git submod
u
l
e add: Re
m
ove old d
o
cs ab
o
ut implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehman
n
gi
t
submodule add: Require the new --for
c
e op
t
i
o
n to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
unio C
H
amano
Merge branch 'j
l
/add-n-ignore-mi
s
sing'
commit
|
commitdiff
|
tree
2010-07-19
David A
g
u
ilar
Do
c
um
e
ntat
i
on
:
Ex
p
lain git
-
mergetool's
u
se of tempor
a
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge bra
n
ch 'jc/diff
-
merge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas
Rast
O
nly run
aggregate-result
s
over actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonat
h
a
n Ni
e
der
Add
a sampl
e
us
e
r
for the svndum
p
lib
r
ary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o C Hamano
d
iff A
.
.
.
B: do not limit the synta
x
too narr
o
w
l
y
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C H
a
mano
Merge br
a
nch
'jn
/
p
a
g
inate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C H
a
mano
Merge bran
c
h 'wp/
m
erge-tree
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merg
e
branch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge br
a
nch 'jc/
d
iff-
m
e
r
ge-base-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
H
amano
M
e
rge branch
'ns
/
merge-rec
u
rsive-upt
o
date'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hama
n
o
Merge bran
c
h '
j
n
/
t
e
sts'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
mano
Merge branch 'eb/d
o
c-log-
m
anpage'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch 'jn/g
r
ep-o
p
en'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Me
r
ge
b
ranch 'mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
e
rge branch
'jk/maint-st
a
tus-keep-ind
e
x-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C H
a
mano
M
e
rge
branch 'jc/
r
ebas
e
-i-com
m
it-msg-fix
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
Hamano
Merge branch 'ab/
s
ubmodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C H
a
man
o
M
erge branch 'bc
/
ma
i
nt-ma
k
efile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Nieder
D
ocum
e
ntati
o
n: a
d
d su
b
mod
u
l
e
.
* to the big configura
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nied
e
r
gitmodules
.
5: url c
a
n be a rel
a
tive path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pav
a
n Ku
m
ar Sunkara
g
i
tweb: fi
x
esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan
Nieder
g
i
t --paginate:
p
a
ginate e
x
ternal commands
again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
ay
S
offian
MERGE_RR is
i
n
.
git, not
.
git/rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
Palmer
merge-tr
e
e: fix where two branches sha
r
e no c
h
anges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Pal
m
er
add
b
asic tests for merge-tr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Git 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge branch
'jc/
r
ea
d
-
t
r
e
e
-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R
H
ar
i
n
a
th
Use dev_t for dev
i
ce id (st_de
v
) from stat in setup
_
g
i
t_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
d
i
ff A
.
.
.
B: g
i
v
e one
p
os
s
ible diff when the
r
e ar
e
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Ha
m
a
no
Merge
bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
gi
t
fetch documentat
i
o
n:
d
escrib
e
sho
r
t '-p'
syn
o
ny
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
iklos Vajna
format-patch: document the
f
ormat
.
t
o confi
g
uratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add: Add th
e
"--ig
n
ore-mis
s
ing" option fo
r
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Grube
r
test-
l
i
b:
TAP compliance for skipping tests
o
n
req
u
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test-lib: simp
l
ify GIT_SKIP_TESTS loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
a
t
han N
i
e
d
e
r
t
3
0
0
0 (ls
-
fi
l
es -o): moder
n
i
ze style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
F
r
e
d
rik Skolmli
D
ocu
m
e
ntation:
Spell
i
ng fix in p
r
otocol-capabili
t
ies
.
t
xt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
m
erge-r
e
cu
r
sive: use "up-to-
d
ate
"
instead
o
f "upto
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las Sebrec
h
t
checko
u
t: accord docume
n
t
a
tion
t
o
what git d
o
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johannes
Six
t
t0
0
0
5
: work around s
t
range $? i
n
ksh wh
e
n program t
e
rminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Jun
i
o C Hamano
Merge remo
t
e br
a
nch
'
ko/m
a
ster' into jc/
r
ead-tr
e
e-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
d
i
f
f
.
c: fix a graph out
p
ut bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Ar
n
f
jörð B
j
armason
tests: Use
s
kip_all=* to sk
i
p
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C H
a
mano
Fix
"
read-tree
-m A B
"
pri
m
ing the cache-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
Reorgan
i
ze `git-log
'
man page to clari
f
y
commo
n
diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazr
i
R
a
mliy
grep -O: Do not p
a
ss color sequenc
e
s
a
s fil
e
name
s
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Gi
t
1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Merge branch 'ab/
t
a
p'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
i
o C
Hamano
bac
k
me
r
ge
a few more fixes
t
o
1
.
7
.
1
.
X seri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Me
r
ge branch 'maint-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uw
e
Kleine-König
r
e
v-parse: fix -
-
parse-opt
--ke
e
p-dashdash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
an
o
Merge branch 'mg/do
c
-rev-parse-tr
e
epa
t
h-synta
x
' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Me
r
ge branch 'tr/rec
e
ive-pack
-
a
liased-update-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
i
erre Habouzit
fix
git bran
c
h -m in pres
e
nce
of
cross de
v
i
ces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
t/t00
0
6: sp
e
c
i
f
y
t
imezone as EST5
n
ot E
S
T to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next