repo.or.cz
/
alt-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
Ramku
m
ar Rama
c
handra
mer
g
e
:
M
ake 'merg
e
.
log
'
an integer or boolean o
p
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachand
r
a
merge: Make '--log' an
integer option for number
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Rama
c
handra
fmt_merge
_
msg:
C
hange fmt
_
merge_msg API to accept shortlog_len
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ieder
mer
g
e scrip
t
:
learn --[no-]
r
er
e
re-autoupdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
ha
n
N
ieder
merge scrip
t
: notice @{-1} shorthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
m
e
rge script:
h
andle
-
-no-ff --no-comm
i
t co
r
rectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Niede
r
merge
s
cript: --ff
-
onl
y
to
disal
l
ow true merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
t
han Nie
d
er
merge script: hand
l
e many-
w
a
y
octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge sc
r
ipt: handle -m --lo
g
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erg
e
scrip
t
: fo
r
bid merge
-
s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge script
:
all
o
w custo
m
strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge script: merge -
X
<
o
pt
i
on>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
sc
r
ipt: improve lo
g
messag
e
subj
e
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n Nieder
merge script: re
f
use to m
e
rge d
u
ring me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
script: tweak unme
r
ge
d
files m
e
ssage to match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge script: --squash, --ff
fro
m
unborn branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
an Nieder
fmt-m
e
rge-msg
-
m to overrid
e
mer
g
e ti
t
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nie
d
er
m
e
rge-base --independent to print
re
d
uced parent
list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onat
h
an Niede
r
merge-base --octopus to mimic show-branch --me
r
ge-ba
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
D
ocumentation: add a SEE ALSO section for me
r
g
e-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an N
i
eder
t6
2
00
(fmt-merge-msg): style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
a
n Nied
e
r
t6010 (
m
e
r
g
e-
b
ase): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t7600 (me
r
ge): te
s
t
m
e
rge from branch yet
to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ede
r
t7600 (merge): che
c
k refl
o
g entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
N
ied
e
r
t76
0
0 (merge): do
n
ot
laun
c
h git
k
for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7600 (mer
g
e): modernize s
t
yle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge: do not mist
a
ke (ancestor of) tag for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io C H
a
mano
tes
t
s: correct "d
o
es reflog exist?
"
tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Br
a
ndon Casey
t/
:
work
around one-
s
hot variable assignment
w
i
th
test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonath
a
n Nieder
t/README: correct a
n
exception
when br
e
aking
a && ch
a
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
r
a
ndon Casey
t/{t5541,l
i
b-httpd}: replace prob
l
ematic
'
!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon C
a
sey
t/t3700: conver
t
two us
e
s
of ne
g
ation operator '
!
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Jun
i
o C Hamano
Mer
g
e
branc
h
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/RE
A
DME
:
clari
f
y tes
t
_
m
ust_
f
ai
l
d
e
sc
r
i
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockma
n
C
heck siz
e
of path buffer befo
r
e
writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
H
a
mano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
up
d
ate
-
serv
e
r-
i
nfo: Sho
r
ten read_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
var
Arnfjörð Bjarmason
gi
t
a
dd: Ad
d
--ignore-missing to SYNOP
S
IS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git s
u
bmo
d
ul
e
add: R
e
mov
e
old
d
ocs ab
o
ut implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Leh
m
a
nn
git submodule add: Require t
h
e new --force
o
ption to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Ham
a
no
Merge
branch 'jl
/
add-n-ignor
e
-missing'
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Documentation:
E
xplai
n
git
-
mergetool's use of
t
emporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Ha
m
ano
Merge branch 'jc/di
f
f-merge-base-
m
ulti'
commit
|
commitdiff
|
tree
2010-07-16
Th
o
ma
s
Rast
Only r
u
n
ag
g
re
g
ate-results over actual c
o
unts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
ona
t
han Nieder
Add a sam
p
le user for
t
he svndump l
i
brary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
i
o C Hamano
diff A
.
.
.
B: do not limit
the
s
yntax
too nar
r
owl
y
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
M
e
r
g
e
b
ra
n
ch
'jn/pagi
n
ate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge
branc
h
'wp/mer
g
e
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge branch 'js/m
e
rge-r
r
-
f
ix
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge bra
n
ch 'jc/
d
if
f
-merge
-
b
a
se
-
m
ulti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'ns/m
e
rge-recursive-
u
ptodate'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ha
m
ano
Merge branch 'jn/tes
t
s'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge branch 'eb/doc-log-manpa
g
e'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge bran
c
h
'jn/
g
rep-
o
pen'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge
bra
n
ch 'mg/revis
i
on-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Mer
g
e br
a
nch 'jk/maint-s
t
atus-k
e
ep-in
d
ex-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hama
n
o
Merge branch 'jc/rebase
-
i-c
o
mmit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C
Hamano
M
erge branch 'ab/su
b
module-ad
d
-f'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
Hamano
Merge br
a
nch '
b
c/
m
aint-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge br
a
nch
'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-07-15
J
ona
t
han Nieder
Document
a
t
i
on: add
s
u
b
mo
d
ule
.
*
t
o t
h
e big config
u
ratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
t
h
a
n Nieder
git
m
o
du
l
es
.
5:
u
rl can be a relative
p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Ku
m
ar Sun
k
a
r
a
gitw
e
b
:
fix esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Niede
r
git --pa
g
i
nate: paginate externa
l
commands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_RR is in
.
git, not
.
git/rr
-
cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will P
a
l
m
er
me
r
ge-tree: fix where two bran
c
h
es share no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
a
d
d b
a
sic tests
f
or merge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Git
1
.
7
.
2-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Ha
m
ano
Me
r
ge branch 'j
c
/
r
ead-tre
e
-cache-tree-f
i
x'
commit
|
commitdiff
|
tree
2010-07-14
Raja
R
Harinath
Use
d
ev_
t
f
or device id (st_
d
ev) from st
a
t in
se
t
u
p
_git
_
dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio
C
Hamano
diff A
.
.
.
B:
g
ive
o
ne pos
s
ib
l
e
d
iff when there a
r
e more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Jun
i
o C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fetch
docume
n
t
at
i
on: desc
r
ibe short '-p
'
s
y
no
n
ym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vaj
n
a
for
m
at-patch: document the format
.
to configur
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Leh
m
ann
g
it add: Add
t
he "--ignore-miss
i
ng" option f
o
r the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
t
e
st-
l
ib: TAP compliance for skipping tests on request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
t
e
s
t-lib: sim
p
l
if
y
GIT_SKIP_TE
S
TS
loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Ni
e
der
t30
0
0 (ls-fi
l
es -o): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
F
redrik Sko
l
mli
D
ocumenta
t
i
o
n: Spelli
n
g f
i
x in pr
o
tocol-capa
b
i
lities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
merge-
r
e
cur
s
ive:
u
se "up-to-date" instea
d
of "u
p
todate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
Seb
r
echt
checko
u
t
:
accord doc
u
menta
t
ion to wh
a
t git d
o
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
o
hannes Sixt
t0005
:
wor
k
around strange $?
in ksh when program terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio
C
H
am
a
n
o
Merge remote
b
ranch 'ko/maste
r
' into
jc/read-tree-
c
a
che
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Yang
diff
.
c: fix a graph output b
u
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð Bjarma
s
on
t
e
s
t
s
: Use skip
_
all=* to skip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio
C Hama
n
o
Fix "read-tree
-
m A B" priming the cach
e
-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Bar
z
ilay
Reorga
n
i
z
e
`git-log
'
man page to clarify com
m
on
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri R
a
mliy
g
r
e
p -O
:
Do no
t
p
ass col
o
r
s
equences as filenames t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Me
r
ge
branc
h
'
a
b/tap'
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Haman
o
Me
r
ge
b
ranch
'
main
t
'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmerge a f
e
w more fi
x
es to
1
.
7
.
1
.
X series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
M
er
g
e
branch
'maint-1
.
6
.
4' into
maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-König
r
e
v-pars
e
:
f
ix --parse-opt -
-
keep-d
a
s
h
d
a
sh -
-
stop-
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
Merge branch
'
mg/doc-rev-parse
-
treepath-
s
y
n
t
a
x' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
u
ni
o
C
H
amano
Merge branch 'tr/receive-pa
c
k-
a
liase
d
-u
p
date-f
i
x'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Habouz
i
t
fix git branch -m in presence of cross
device
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
t/t0006
:
specify
t
ime
z
one as EST5 not EST to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next