Home
last modified time | relevance | path

Searched refs:unmerged (Results 1 – 25 of 1055) sorted by relevance

12345678910>>...43

/dports/devel/git-cola/git-cola-3.10.1/cola/models/
H A Dselection.py20 elif s.unmerged:
21 files = s.unmerged
33 return list(sorted(set(s.staged + s.unmerged + s.modified + s.untracked)))
58 self.unmerged = []
65 self.unmerged = []
72 bool(self.staged or self.unmerged or self.modified or self.untracked)
78 self.unmerged = s.unmerged
85 _filter(self.unmerged, other.unmerged)
91 return State(self.staged, self.unmerged, self.modified, self.untracked)
103 elif self.unmerged:
[all …]
/dports/www/gitea/gitea-1.16.5/services/pull/
H A Dpatch_unmerged.go122 func unmergedFiles(ctx context.Context, tmpBasePath string, unmerged chan *unmergedFile) {
125 close(unmerged)
142 unmerged <- &unmergedFile{err: fmt.Errorf("unable to run ls-files -u -z! Error: %v", line.err)}
153 unmerged <- next
159 unmerged <- next
166 unmerged <- next
172 …unmerged <- &unmergedFile{err: fmt.Errorf("unexpected stage %d for path %s in git ls-files -u -z",…
178 unmerged <- next
/dports/www/oauth2-proxy/oauth2-proxy-7.2.0/vendor/github.com/nxadm/tail/
H A DCHANGES.md21 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
26 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
28 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
30 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
35 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
37 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/sysutils/kubectl/kubernetes-1.22.2/vendor/github.com/nxadm/tail/
H A DCHANGES.md21 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
26 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
28 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
30 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
35 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
37 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/multimedia/navidrome/navidrome-0.40.0/vendor/github.com/nxadm/tail/
H A DCHANGES.md21 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
26 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
28 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
30 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
35 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
37 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/devel/git-extras/git-extras-6.3.0/man/
H A Dgit-show-unmerged-branches.md1 git-show-unmerged-branches(1) -- Show unmerged branches
6 `git-show-unmerged-branches`
14 $ git show-unmerged-branches
/dports/net/storj/storj-1.45.3/vendor/github.com/nxadm/tail/
H A DCHANGES.md31 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
36 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
38 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
40 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
45 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
47 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/net-im/dendrite/dendrite-0.5.1/vendor/github.com/nxadm/tail/
H A DCHANGES.md31 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
36 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
38 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
40 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
45 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
47 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/dns/blocky/blocky-0.17/vendor/github.com/nxadm/tail/
H A DCHANGES.md31 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
36 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
38 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
40 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
45 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
47 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/security/xray-core/Xray-core-1.5.0/vendor/github.com/nxadm/tail/
H A DCHANGES.md31 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
36 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
38 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
40 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
45 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
47 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/net/ooni-probe-cli/probe-cli-3.10.1/vendor/github.com/nxadm/tail/
H A DCHANGES.md31 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
36 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
38 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
40 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
45 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
47 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/net/traefik/traefik-2.6.1/vendor/github.com/nxadm/tail/
H A DCHANGES.md31 * Incorporated changes of unmerged upstream PR 149 by mezzi: "added line num
36 * Incorporated changes of unmerged upstream PR 128 by jadekler: "Compile-able
38 * Incorporated changes of unmerged upstream PR 130 by fgeller: "small change
40 * Incorporated changes of unmerged upstream PR 133 by sm3142: "removed
45 * Incorporated changes of unmerged upstream PR 126 by Code-Hex: "Solved the
47 * Incorporated changes of unmerged upstream PR 131 by StoicPerlman: "Remove
/dports/devel/jna/jna-5.7.0/contrib/platform/src/com/sun/jna/platform/
H A DRasterRangesUtils.java178 Set<Rectangle> unmerged = mergeRects(prevLine, curLine); in outputOccupiedRangesOfBinaryPixels() local
179 rects.addAll(unmerged); in outputOccupiedRangesOfBinaryPixels()
228 Set<Rectangle> unmerged = mergeRects(prevLine, curLine); in outputOccupiedRanges() local
229 rects.addAll(unmerged); in outputOccupiedRanges()
244 Set<Rectangle> unmerged = new HashSet<Rectangle>(prev); in mergeRects() local
253 return unmerged; in mergeRects()
257 unmerged.remove(pr[ipr]); in mergeRects()
267 return unmerged; in mergeRects()
/dports/shells/yash/yash-2.51/share/completion/
H A Dgit-checkout16 "--conflict:; like --merge, but specify format of unmerged files"
18 "f --force; overwrite local changes or ignore unmerged files"
24 "--ours; checkout local version for unmerged files"
27 "--theirs; checkout remote version for unmerged files"
/dports/security/keybase/client-v5.7.1/go/kbfs/libkbfs/
H A Dfolder_branch_status.go94 unmerged []*crChainSummary member
135 func (fbsk *folderBranchStatusKeeper) setCRSummary(unmerged []*crChainSummary,
139 if reflect.DeepEqual(unmerged, fbsk.unmerged) &&
143 fbsk.unmerged = unmerged
277 fbs.Unmerged = fbsk.unmerged
H A Dconflict_resolver.go85 unmerged kbfsmd.Revision member
181 if ci.unmerged <= cr.currInput.unmerged &&
374 unmerged[i] = newMd
377 if len(unmerged) > 0 && unmerged[0].BID() == kbfsmd.PendingLocalSquashBranchID {
397 if len(unmerged) > 0 {
404 unmerged[0].mdID, unmerged[0].BID())
438 rev := unmerged[len(unmerged)-1].bareMd.RevisionNumber()
465 (len(unmerged) > 0 && unmerged[0].BID() == kbfsmd.PendingLocalSquashBranchID) {
513 if len(unmerged) == 0 || unmerged[0].BID() != kbfsmd.PendingLocalSquashBranchID {
1284 if len(unmerged) == 0 {
[all …]
/dports/devel/simgear/simgear-2020.3.11/simgear/scene/material/
H A DEffect.hxx123 : unmerged(unmerged_), paths(paths_) in Key()
128 unmerged = rhs.unmerged; in operator =()
132 SGPropertyNode_ptr unmerged; member
/dports/lang/spidermonkey60/firefox-60.9.0/testing/web-platform/meta/css/css-tables/
H A Dhtml5-table-formatting-2.html.ini2 [Border-spacing is added between any two unmerged columns (1)]
5 [Border-spacing is added between any two unmerged columns (5)]
/dports/lang/spidermonkey78/firefox-78.9.0/testing/web-platform/meta/css/css-tables/
H A Dhtml5-table-formatting-2.html.ini2 [Border-spacing is added between any two unmerged columns (1)]
5 [Border-spacing is added between any two unmerged columns (5)]
/dports/devel/git-cola/git-cola-3.10.1/cola/widgets/
H A Dstatus.py350 (set(new_c.unmerged), old_c.unmerged, set(old_s.unmerged), select_unmerged),
543 self._set_unmerged(self.m.unmerged)
648 elif s.unmerged:
896 unmerged = None
903 elif s.unmerged:
904 unmerged = s.unmerged[0]
960 (c.unmerged, self.idx_unmerged),
999 def unmerged(self): member in StatusTreeWidget
1071 elif unmerged:
1090 elif unmerged:
[all …]
/dports/misc/cheat/cheat-4.2.2/vendor/github.com/docopt/docopt-go/docopt.go-ee0de3bc6815/examples/fake-git/checkout/
H A Dgit_checkout.go20 -2, --ours checkout our version for unmerged files
21 -3, --theirs checkout their version for unmerged files
/dports/textproc/htmltest/htmltest-0.15.0/vendor/github.com/docopt/docopt-go/examples/fake-git/checkout/
H A Dgit_checkout.go20 -2, --ours checkout our version for unmerged files
21 -3, --theirs checkout their version for unmerged files
/dports/www/tusc/tusc-0.4.7/vendor/github.com/docopt/docopt-go/examples/fake-git/checkout/
H A Dgit_checkout.go20 -2, --ours checkout our version for unmerged files
21 -3, --theirs checkout their version for unmerged files
/dports/shells/zsh/zsh-5.8.1/Completion/Unix/Command/
H A D_rcs7 '-E[output unmerged changes, bracketing conflicts]' \
9 '-e[output unmerged changes]' \
/dports/multimedia/get_iplayer/get_iplayer-3.28/
H A DMakefile6 @git update-index --refresh --unmerged
22 @git update-index --refresh --unmerged

12345678910>>...43