git stash ni nini na lini unayoitumia?

Question

Accepted Answer

**git stash** inahifadhi kwa muda **mabadiliko yako yasiyohifadhiwa** na inarudisha saraka lako ya kazi kuwa katika hali safi — ili uweze kubadilisha muktadha (k.m kutengeneza hitilafu haraka kwenye tawi lingine) bila kutunga kazi nusu-imalizwa, kisha kurudisha mabadiliko baadaye.

## Tatizo ambalo stash inarisulisha

```text
You're mid-work with uncommitted changes, but need to switch context urgently:
  → switch branches? Git may refuse (uncommitted changes would conflict) or carry
    them along messily
  → commit half-done work? No — it's not ready (pollutes history)
→ STASH saves your changes aside, giving you a clean working directory to switch.
```

## Kutumia stash

```bash
git stash                      # save uncommitted changes; working dir becomes clean
git stash push -m "message"    # stash with a description
git stash list                 # list stashes (stash@{0}, stash@{1}, ...)

git stash pop                  # RESTORE the latest stash AND remove it from the list
git stash apply                # restore but KEEP it in the stash list
git stash apply stash@{1}      # apply a specific stash
git stash drop stash@{0}       # delete a stash
git stash clear                # remove all stashes
```

`git stash` inahifadhi mabadiliko na kusafisha saraka la kazi; `git stash pop` inarudisha yaliyohifadhiwa baadaye (na kuondoa stash). `apply` inarudisha bila kuondoa.

## Hali ya kawaida

```bash
# working on a feature, but an urgent bug needs fixing on main:
git stash                      # save the in-progress feature work
git switch main
# ... fix the urgent bug, commit, push ...
git switch feature
git stash pop                  # restore the feature work and continue
```

## Chaguzi muhimu

```text
git stash -u        → also stash UNTRACKED files (not just tracked changes)
git stash show -p   → see what's in a stash
→ Stash is for TEMPORARY storage — not a substitute for commits/branches long-term.
```

## Kwa nini inamaanisha

Kuelewa `git stash` ni thamani kwa **kushughulikia mabadiliko ya muktadha kwa usafi**, hali ya kawaida ya dunia halisi, kwa hivyo ni ujuzi wa Git wa vitendo muhimu.

Tatizo ambalo linarisulisha ni la mara kwa mara: uko katikati ya kazi na mabadiliko yasiyohifadhiwa wakati unahitaji **kubadilisha muktadha kwa dharura** (kutengeneza hitilafu ya uzalishaji kwenye tawi lingine, kupitia msimamo wa mtu mwingine, kuvuta sasisho) — lakini kubadilisha matawi na mabadiliko yasiyohifadhiwa ni tatizo (Git inaweza kukataa au kuzibeba kwa usagacano), na kutunga kazi nusu-imalizwa kunajaza historia. **Stash** inarisulisha hili kwa njia nzuri kwa **kuokoa mabadiliko yako kando** na kukupa saraka la kazi safi kubadilisha muktadha, kisha **kurudisha yaliyohifadhiwa baadaye** unapofika — rafiki kabisa ya hali ya kawaida ya "Ninahitaji kuachilia kazi yangu kwa muda."

Kuelewa amri za msingi (`git stash` kusave, `git stash pop` kurudisha-na-kuondoa, `git stash apply` kurudisha-na-kubaki, `git stash list` kuona stashes) na mtiririko wa kawaida (stash kazi inayoendelea, badilisha na kushughulikia kazi haraka, badilisha nyuma na pop) ni ujuzi wa kila siku wa vitendo kwa kumaanisha matapeli.

Kujua chaguzi muhimu (`-u` kujumuisha faili ambazo hazijatungiwa, kuona yaliyomo kwa stash) na kwamba stash ni kwa **hifadhi ya muda** (si mbadala mrefu wa commits/matawi) inaonyesha matumizi sahihi.

Kwa sababu mabadiliko ya muktadha na matapeli ni ya kawaida katika maendeleo (hitilafu haraka, mapitio, kuhitaji saraka la kazi safi), na kwa sababu stash inatoa njia safi na rahisi kuokoa kazi yasiyohifadhiwa kwa muda na kurudisha baadaye, kuelewa `git stash` — tatizo linalorisolisha, amri, na mtiririko wa muktadha-badilika — ni ujuzi wa Git wa thamani na wa vitendo kwa kushughulikia haja ya kawaida dunia halisi ya kubadilisha muktadha bila kutunga kazi isiyokamilika, zana inayofaa inayoboresha matapeli ya kawaida ya maendeleo ya kila siku.