Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • Kate Kate
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 27
    • Issues 27
    • List
    • Boards
    • Service Desk
    • Milestones
  • Bugzilla
    • Bugzilla
  • Merge requests 7
    • Merge requests 7
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • UtilitiesUtilities
  • KateKate
  • Issues
  • #24
Closed
Open
Issue created Feb 06, 2021 by Waqar Ahmed@waqarDeveloper14 of 15 checklist items completed14/15 checklist items

Git integration discussion

Here we can discuss git integration related stuff.

Goals

  • Support most commonly used git stuff

Non Goals

  • Be a competitor to git guis
  • Have support for advanced / not commonly used features

Features that would be nice to have

  • Git checkout support
  • Branch creation
  • File staging
  • viewing untracked / modified stuff
  • Line / hunk staging
  • Diff viewing - Partially done, allows external diff tool and view raw diffs
  • Conflict Resolution
  • Pull + Push - Basic support for it. Maybe we'll improve on it if there are better ideas.
  • Stashing
  • Commit with extended description
  • Git blame (tons of UIs for it already, + design for it needs some deep thinking so that we get it right)
  • Beautiful git icons, see frameworks/breeze-icons#2 (closed)
  • Show file history
  • Compare branches , rev 1
  • Commit Ammend

Undecided

  • Log

Additional stuff for project plugin

  • Project files (in git mode), should show that a file is modified by coloring it.
  • Maybe rethink how to show untracked files?
  • context menus will need to have git related options?

Current idea is to do this inside the project plugin. Advantage would be that we can notify the project plugin about changes. Disadvantage is that code will grow, which is not really a big disadvantage I think. Another advantage is that vcs is related to project stuff, so things will live quite near to the project in UI and will be discoverable.

Edited May 19, 2021 by Waqar Ahmed
Assignee
Assign to
Time tracking