How to combine new changes with previous commit in git -

-

i made commit , have additional changes if committed give me 2 commits & b.

what efficient way combine new changes ones previous commit end 1 commit?

git add -u && git commit --amend

this stage local changes , use them rewrite previous commit. note if you've pushed previous commit bad idea.


Comments

Post a Comment

Popular posts from this blog

delphi - TJvHidDeviceController "DevicePath" always showing "\" -

-
i'm using tjvhiddevicecontroller class retrive hid device information. have plugged 2 hid devices, i'm trying ge "devicepath" of sp_device_interface_detail_data_a structure getting device path '\'. ican't open createfile function. please me solve issue. os win7. all. this guessing! the 1 thing can think of is: tjvhiddevicecontroller calls windows api call without using or w suffix. structure used sp_device_interface_detail_data_a, ansi version. now, if use delphi 2009 or higher, routine expect sp_device_interface_detail_data_w. size same looks ok. strings stored usc2 encoded (widechars) instead of ansi encoded -> after every ansi character there null byte. tjvhiddevicecontroller converts character array pascal string using function strpas , hence, see first character. check: set breakpoint after function call fills structure , use cpu window view content memory dump. if see ansi characters every other byte , null bytes in between, ca...
Read more

Disabling Android home button for industry application -

-
i'm writing industry application used traffic wardens register offences through program using forms. the app using webview container external webpage. don't want our users exit application have disable buttons. succeeded in disabling them except home button. i read threads topic, don't have solutions yet. idea able make app default home app if user presses home button launches app , not exit. how can accomplish that? if must able tamper android (when install app), if there solution through configuration appreciated. the idea able make app default home app if user presses home button launches app , not exit. how can accomplish that? there sample home application in android sdk. mirror manifest entry, notably putting home category in activity's <intent-filter> . the first time the, er, traffic warden taps home after installing app, chooser appear home app run. checking checkbox , tapping app mean home button run app forevermore. beyond cr...
Read more

c# - HwndSource win32 integration with Ribbons and KeyTips -

-
my situation rather complex, i've seen other people this. unfortunately, there no mention of specific problem. in process of trying integrate wpf usercontrol including ribbon win32 host application. far, has been working pretty neat (to surprise, even). using hwndsource create raw win32 child-window , embed win32 host top-level window. have tried tabcontrols, buttons, radiobuttons, webbrowsers , inside usercontrol , usable within win32 host application. and, of course, there ribbon control @ top row of usercontrol's grid. here's doing: mhwnd = new hwndsource ( 0, 0x40000000 | 0x10000000, 0, left, top, width, height, "cintegrationtest", parenthandle); muserctrl = new usercontrol1 (); mhwnd.rootvisual = muserctrl; this works rather good. have other controls (like edit , few buttons) in usercontrol1 below ribbon. when keyboard focus inside 1 of these controls, can use alt+ access keytips of ribbontabs , it's elemen...
Read more